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

Side by Side Diff: ppapi/ppapi_untrusted.gyp

Issue 10915213: [NaCl SDK] build_sdk uses gyp to build, not scons. * (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: mac fixes Created 8 years, 3 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
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 'build_glibc': 1, 21 'build_glibc': 1,
21 'build_newlib': 1, 22 'build_newlib': 1,
22 'sources': [ 23 'sources': [
23 '<@(cpp_source_files)', 24 '<@(cpp_source_files)',
24 'cpp/module_embedder.h', 25 'cpp/module_embedder.h',
25 'cpp/ppp_entrypoints.cc', 26 'cpp/ppp_entrypoints.cc',
26 ], 27 ],
27 }, 28 },
28 'dependencies': [ 29 'dependencies': [
29 '<(DEPTH)/native_client/tools.gyp:prep_toolchain', 30 '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
30 ], 31 ],
31 }, 32 },
32 { 33 {
33 'target_name': 'ppapi_gles2_lib', 34 'target_name': 'ppapi_gles2_lib',
34 'type': 'none', 35 'type': 'none',
35 'variables': { 36 'variables': {
36 'nlib_target': 'libppapi_gles2.a', 37 'nlib_target': 'libppapi_gles2.a',
38 'nso_target': 'libppapi_gles2.so',
37 'build_glibc': 1, 39 'build_glibc': 1,
38 'build_newlib': 1, 40 'build_newlib': 1,
39 'include_dirs': [ 41 'include_dirs': [
40 'lib/gl/include', 42 'lib/gl/include',
41 ], 43 ],
42 'sources': [ 44 'sources': [
43 'lib/gl/gles2/gl2ext_ppapi.c', 45 'lib/gl/gles2/gl2ext_ppapi.c',
44 'lib/gl/gles2/gl2ext_ppapi.h', 46 'lib/gl/gles2/gl2ext_ppapi.h',
45 'lib/gl/gles2/gles2.c', 47 'lib/gl/gles2/gles2.c',
46 ], 48 ],
47 }, 49 },
48 'dependencies': [ 50 'dependencies': [
49 '<(DEPTH)/native_client/tools.gyp:prep_toolchain', 51 '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
50 ], 52 ],
51 }, 53 },
52 { 54 {
53 'target_name': 'ppapi_nacl_tests', 55 'target_name': 'ppapi_nacl_tests',
54 'type': 'none', 56 'type': 'none',
55 'dependencies': [ 57 'dependencies': [
58 '<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:nacl_lib',
56 'ppapi_cpp_lib', 59 'ppapi_cpp_lib',
57 'native_client/native_client.gyp:ppapi_lib', 60 'native_client/native_client.gyp:ppapi_lib',
58 ], 61 ],
59 'variables': { 62 'variables': {
60 # TODO(bradnelson): Remove this compile flag once new nacl_rev is 63 # TODO(bradnelson): Remove this compile flag once new nacl_rev is
61 # above 9362. 64 # above 9362.
62 'compile_flags': [ 65 'compile_flags': [
63 '-DGL_GLEXT_PROTOTYPES', 66 '-DGL_GLEXT_PROTOTYPES',
64 ], 67 ],
65 'defines': [ 68 'defines': [
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 # and lib64 directories created in the PRODUCT_DIR. 136 # and lib64 directories created in the PRODUCT_DIR.
134 # They are created as a side-effect of NMF creation. 137 # They are created as a side-effect of NMF creation.
135 'outputs': ['>(nmf_glibc)'], 138 'outputs': ['>(nmf_glibc)'],
136 'action': [ 139 'action': [
137 'python', 140 'python',
138 '<(DEPTH)/native_client_sdk/src/tools/create_nmf.py', 141 '<(DEPTH)/native_client_sdk/src/tools/create_nmf.py',
139 '>@(_inputs)', 142 '>@(_inputs)',
140 '--objdump=>(nacl_objdump)', 143 '--objdump=>(nacl_objdump)',
141 '--library-path=>(libdir_glibc64)', 144 '--library-path=>(libdir_glibc64)',
142 '--library-path=>(libdir_glibc32)', 145 '--library-path=>(libdir_glibc32)',
146 '--library-path=<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32',
147 '--library-path=<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64',
noelallen1 2012/09/21 23:20:25 Should we be changing the output directory for the
143 '--output=>(nmf_glibc)', 148 '--output=>(nmf_glibc)',
144 '--stage-dependencies=<(PRODUCT_DIR)', 149 '--stage-dependencies=<(PRODUCT_DIR)',
145 '--toolchain=glibc', 150 '--toolchain=glibc',
146 ], 151 ],
147 }, 152 },
148 ], 153 ],
149 }], 154 }],
150 ], 155 ],
151 }, 156 },
152 ], 157 ],
153 } 158 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698