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

Side by Side Diff: build/all.gyp

Issue 10909144: Reapply change 9663 (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client/
Patch Set: 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
« no previous file with comments | « no previous file | build/build_nexe.py » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 { 1 {
2 'includes': [ 2 'includes': [
3 'common.gypi', 3 'common.gypi',
4 ], 4 ],
5 'targets': [ 5 'targets': [
6 { 6 {
7 'target_name': 'pull_in_all', 7 'target_name': 'pull_in_all',
8 'type': 'none', 8 'type': 'none',
9 'dependencies': [ 9 'dependencies': [
10 '../src/shared/gio/gio.gyp:*', 10 '../src/shared/gio/gio.gyp:*',
11 '../src/shared/imc/imc.gyp:*', 11 '../src/shared/imc/imc.gyp:*',
12 '../src/shared/platform/platform.gyp:*', 12 '../src/shared/platform/platform.gyp:*',
13 '../src/shared/srpc/srpc.gyp:*', 13 '../src/shared/srpc/srpc.gyp:*',
14 '../src/shared/utils/utils.gyp:*', 14 '../src/shared/utils/utils.gyp:*',
15 '../src/trusted/debug_stub/debug_stub.gyp:*', 15 '../src/trusted/debug_stub/debug_stub.gyp:*',
16 '../src/trusted/desc/desc.gyp:*', 16 '../src/trusted/desc/desc.gyp:*',
17 '../src/trusted/nacl_base/nacl_base.gyp:*', 17 '../src/trusted/nacl_base/nacl_base.gyp:*',
18 '../src/trusted/nonnacl_util/nonnacl_util.gyp:*', 18 '../src/trusted/nonnacl_util/nonnacl_util.gyp:*',
19 '../src/trusted/perf_counter/perf_counter.gyp:*', 19 '../src/trusted/perf_counter/perf_counter.gyp:*',
20 '../src/trusted/platform_qualify/platform_qualify.gyp:*', 20 '../src/trusted/platform_qualify/platform_qualify.gyp:*',
21 '../src/trusted/sel_universal/sel_universal.gyp:*', 21 '../src/trusted/sel_universal/sel_universal.gyp:*',
22 '../src/trusted/service_runtime/service_runtime.gyp:*', 22 '../src/trusted/service_runtime/service_runtime.gyp:*',
23 '../src/untrusted/irt/irt.gyp:irt_core_nexe', 23 '../src/untrusted/irt/irt.gyp:irt_core_nexe',
24 '../src/untrusted/nacl/nacl.gyp:*', 24 '../src/untrusted/nacl/nacl.gyp:*',
25 '../src/untrusted/nosys/nosys.gyp:*', 25 '../src/untrusted/nosys/nosys.gyp:*',
26 '../src/untrusted/pthread/pthread.gyp:*', 26 '../src/untrusted/pthread/pthread.gyp:*',
27 '../tests/sel_main_chrome/sel_main_chrome.gyp:*', 27 '../tests/sel_main_chrome/sel_main_chrome.gyp:*',
28 'nacl_core_sdk.gyp:*',
28 ], 29 ],
29 'conditions': [ 30 'conditions': [
30 # No tests on ARM yet. 31 # No tests on ARM yet.
31 ['target_arch!="arm"', { 32 ['target_arch!="arm"', {
32 'dependencies': [ 33 'dependencies': [
33 '../tests.gyp:*', 34 '../tests.gyp:*',
34 ], 35 ],
35 }], 36 }],
36 ['target_arch=="arm"', { 37 ['target_arch=="arm"', {
37 'dependencies': [ 38 'dependencies': [
38 '../src/trusted/validator_arm/validator_arm.gyp:*', 39 '../src/trusted/validator_arm/validator_arm.gyp:*',
39 ], 40 ],
40 }, { 41 }, {
41 'dependencies': [ 42 'dependencies': [
42 '../src/trusted/validator_x86/validator_x86.gyp:*', 43 '../src/trusted/validator_x86/validator_x86.gyp:*',
43 ], 44 ],
44 }], 45 }],
45 ], 46 ],
46 }, 47 },
47 ], 48 ],
48 } 49 }
OLDNEW
« no previous file with comments | « no previous file | build/build_nexe.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698