Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(663)

Side by Side Diff: ppapi/ppapi_untrusted.gyp

Issue 10825145: Modifying ppapi_untrusted to match new gyp expectations. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix comment Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 # This GYP file defines untrusted (NaCl) targets. All targets in this 5 # This GYP file defines untrusted (NaCl) targets. All targets in this
6 # file should be conditionally depended upon via 'disable_nacl!=1' to avoid 6 # file should be conditionally depended upon via 'disable_nacl!=1' to avoid
7 # requiring NaCl sources for building. 7 # requiring NaCl sources for building.
8 8
9 { 9 {
10 'includes': [ 10 'includes': [
(...skipping 18 matching lines...) Expand all
29 '<(DEPTH)/native_client/tools.gyp:prep_toolchain', 29 '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
30 ], 30 ],
31 }, 31 },
32 { 32 {
33 'target_name': 'ppapi_nacl_tests', 33 'target_name': 'ppapi_nacl_tests',
34 'type': 'none', 34 'type': 'none',
35 'dependencies': [ 35 'dependencies': [
36 'ppapi_cpp_lib', 36 'ppapi_cpp_lib',
37 'native_client/native_client.gyp:ppapi_lib', 37 'native_client/native_client.gyp:ppapi_lib',
38 'native_client/native_client.gyp:nacl_irt', 38 'native_client/native_client.gyp:nacl_irt',
39 ], 39 ],
40 'variables': { 40 'variables': {
41 'defines': [ 41 # TODO(bradnelson): Remove this compile flag once new nacl_rev is
42 '<@(default_defines)', 42 # above 9362.
43 '-DGL_GLEXT_PROTOTYPES', 43 'compile_flags': [
44 ], 44 '-DGL_GLEXT_PROTOTYPES',
45 ],
46 'defines': [
47 'GL_GLEXT_PROTOTYPES',
48 ],
45 'nexe_target': 'ppapi_nacl_tests', 49 'nexe_target': 'ppapi_nacl_tests',
46 'build_newlib': 1, 50 'build_newlib': 1,
47 'include_dirs': [ 51 'include_dirs': [
48 'lib/gl/include', 52 'lib/gl/include',
49 '..', 53 '..',
50 ], 54 ],
51 'link_flags': [ 55 'link_flags': [
52 '-lppapi_cpp', 56 '-lppapi_cpp',
53 '-lppapi', 57 '-lppapi',
54 '-lplatform', 58 '-lplatform',
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 '--stage-dependencies=<(PRODUCT_DIR)', 127 '--stage-dependencies=<(PRODUCT_DIR)',
124 '--toolchain=glibc', 128 '--toolchain=glibc',
125 ], 129 ],
126 }, 130 },
127 ], 131 ],
128 }], 132 }],
129 ], 133 ],
130 }, 134 },
131 ], 135 ],
132 } 136 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698