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

Side by Side Diff: ppapi/ppapi_untrusted.gyp

Issue 11360223: Revert "Add support in NaCl browser tests for testing pnacl-translated nexes" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 1 month 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 | « ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp ('k') | 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': [
11 '../native_client/build/untrusted.gypi', 11 '../native_client/build/untrusted.gypi',
12 'ppapi_sources.gypi', 12 'ppapi_sources.gypi',
13 ], 13 ],
14 'targets': [ 14 'targets': [
15 { 15 {
16 'target_name': 'ppapi_cpp_lib', 16 'target_name': 'ppapi_cpp_lib',
17 'type': 'none', 17 'type': 'none',
18 'variables': { 18 'variables': {
19 'nlib_target': 'libppapi_cpp.a', 19 'nlib_target': 'libppapi_cpp.a',
20 'nso_target': 'libppapi_cpp.so', 20 'nso_target': 'libppapi_cpp.so',
21 'build_glibc': 1, 21 'build_glibc': 1,
22 'build_newlib': 1, 22 'build_newlib': 1,
23 'build_pnacl_newlib': 1,
24 'sources': [ 23 'sources': [
25 '<@(cpp_source_files)', 24 '<@(cpp_source_files)',
26 'cpp/module_embedder.h', 25 'cpp/module_embedder.h',
27 'cpp/ppp_entrypoints.cc', 26 'cpp/ppp_entrypoints.cc',
28 ], 27 ],
29 }, 28 },
30 'dependencies': [ 29 'dependencies': [
31 '<(DEPTH)/native_client/tools.gyp:prep_toolchain', 30 '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
32 ], 31 ],
33 }, 32 },
34 { 33 {
35 'target_name': 'ppapi_gles2_lib', 34 'target_name': 'ppapi_gles2_lib',
36 'type': 'none', 35 'type': 'none',
37 'variables': { 36 'variables': {
38 'nlib_target': 'libppapi_gles2.a', 37 'nlib_target': 'libppapi_gles2.a',
39 'nso_target': 'libppapi_gles2.so', 38 'nso_target': 'libppapi_gles2.so',
40 'build_glibc': 1, 39 'build_glibc': 1,
41 'build_newlib': 1, 40 'build_newlib': 1,
42 'build_pnacl_newlib': 1,
43 'include_dirs': [ 41 'include_dirs': [
44 'lib/gl/include', 42 'lib/gl/include',
45 ], 43 ],
46 'sources': [ 44 'sources': [
47 'lib/gl/gles2/gl2ext_ppapi.c', 45 'lib/gl/gles2/gl2ext_ppapi.c',
48 'lib/gl/gles2/gl2ext_ppapi.h', 46 'lib/gl/gles2/gl2ext_ppapi.h',
49 'lib/gl/gles2/gles2.c', 47 'lib/gl/gles2/gles2.c',
50 ], 48 ],
51 }, 49 },
52 'dependencies': [ 50 'dependencies': [
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 '--stage-dependencies=<(PRODUCT_DIR)', 149 '--stage-dependencies=<(PRODUCT_DIR)',
152 '--toolchain=glibc', 150 '--toolchain=glibc',
153 ], 151 ],
154 }, 152 },
155 ], 153 ],
156 }], 154 }],
157 ], 155 ],
158 }, 156 },
159 ], 157 ],
160 } 158 }
OLDNEW
« no previous file with comments | « ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698