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

Side by Side Diff: ppapi/ppapi_nacl.gyp

Issue 1097153002: NaCl/GYP: remove references to prep_toolchain. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Edit Created 5 years, 8 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
« no previous file with comments | « ppapi/ppapi_ipc_nacl.gyp ('k') | ppapi/ppapi_proxy_nacl.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 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 '../build/common_untrusted.gypi', 11 '../build/common_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, 23 'build_pnacl_newlib': 1,
24 'sources': [ 24 'sources': [
25 '<@(cpp_source_files)', 25 '<@(cpp_source_files)',
26 'cpp/module_embedder.h', 26 'cpp/module_embedder.h',
27 'cpp/ppp_entrypoints.cc', 27 'cpp/ppp_entrypoints.cc',
28 ], 28 ],
29 }, 29 },
30 'dependencies': [
31 '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
32 ],
33 }, 30 },
34 { 31 {
35 'target_name': 'ppapi_gles2_lib', 32 'target_name': 'ppapi_gles2_lib',
36 'type': 'none', 33 'type': 'none',
37 'variables': { 34 'variables': {
38 'nlib_target': 'libppapi_gles2.a', 35 'nlib_target': 'libppapi_gles2.a',
39 'nso_target': 'libppapi_gles2.so', 36 'nso_target': 'libppapi_gles2.so',
40 'build_glibc': 1, 37 'build_glibc': 1,
41 'build_newlib': 1, 38 'build_newlib': 1,
42 'build_pnacl_newlib': 1, 39 'build_pnacl_newlib': 1,
43 'include_dirs': [ 40 'include_dirs': [
44 'lib/gl/include', 41 'lib/gl/include',
45 ], 42 ],
46 'sources': [ 43 'sources': [
47 'lib/gl/gles2/gl2ext_ppapi.c', 44 'lib/gl/gles2/gl2ext_ppapi.c',
48 'lib/gl/gles2/gl2ext_ppapi.h', 45 'lib/gl/gles2/gl2ext_ppapi.h',
49 'lib/gl/gles2/gles2.c', 46 'lib/gl/gles2/gles2.c',
50 ], 47 ],
51 }, 48 },
52 'dependencies': [
53 '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
54 ],
55 }, 49 },
56 { 50 {
57 'target_name': 'ppapi_nacl_tests', 51 'target_name': 'ppapi_nacl_tests',
58 'type': 'none', 52 'type': 'none',
59 'dependencies': [ 53 'dependencies': [
60 '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
61 '<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:nacl_lib', 54 '<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:nacl_lib',
62 '<(DEPTH)/native_client/src/untrusted/pthread/pthread.gyp:pthread_lib', 55 '<(DEPTH)/native_client/src/untrusted/pthread/pthread.gyp:pthread_lib',
63 'ppapi_cpp_lib', 56 'ppapi_cpp_lib',
64 'native_client/native_client.gyp:ppapi_lib', 57 'native_client/native_client.gyp:ppapi_lib',
65 ], 58 ],
66 'variables': { 59 'variables': {
67 # This is user code (vs IRT code), so tls accesses do not 60 # This is user code (vs IRT code), so tls accesses do not
68 # need to be indirect through a function call. 61 # need to be indirect through a function call.
69 'newlib_tls_flags=': [], 62 'newlib_tls_flags=': [],
70 # TODO(bradnelson): Remove this compile flag once new nacl_rev is 63 # TODO(bradnelson): Remove this compile flag once new nacl_rev is
(...skipping 284 matching lines...) Expand 10 before | Expand all | Expand 10 after
355 '>@(create_nmf_flags)', 348 '>@(create_nmf_flags)',
356 '--output=>(nmf_pnacl)', 349 '--output=>(nmf_pnacl)',
357 ], 350 ],
358 }, 351 },
359 ], 352 ],
360 }], 353 }],
361 ], 354 ],
362 }, 355 },
363 ], 356 ],
364 } 357 }
OLDNEW
« no previous file with comments | « ppapi/ppapi_ipc_nacl.gyp ('k') | ppapi/ppapi_proxy_nacl.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698