| OLD | NEW |
| 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/gdb_rsp/gdb_rsp.gyp:*', | 17 '../src/trusted/gdb_rsp/gdb_rsp.gyp:*', |
| 18 '../src/trusted/nacl_base/nacl_base.gyp:*', | 18 '../src/trusted/nacl_base/nacl_base.gyp:*', |
| 19 '../src/trusted/nonnacl_util/nonnacl_util.gyp:*', | 19 '../src/trusted/nonnacl_util/nonnacl_util.gyp:*', |
| 20 '../src/trusted/perf_counter/perf_counter.gyp:*', | 20 '../src/trusted/perf_counter/perf_counter.gyp:*', |
| 21 '../src/trusted/platform_qualify/platform_qualify.gyp:*', | 21 '../src/trusted/platform_qualify/platform_qualify.gyp:*', |
| 22 # TODO(robertm): Make sel_universal work without relying on the old input | 22 # TODO(robertm): Make sel_universal work without relying on the old input |
| 23 # events. See http://code.google.com/p/nativeclient/issues/detail?id=2066 | 23 # events. See http://code.google.com/p/nativeclient/issues/detail?id=2066 |
| 24 # '../src/trusted/sel_universal/sel_universal.gyp:*', | 24 # '../src/trusted/sel_universal/sel_universal.gyp:*', |
| 25 '../src/trusted/service_runtime/service_runtime.gyp:*', | 25 '../src/trusted/service_runtime/service_runtime.gyp:*', |
| 26 '../src/untrusted/irt/irt.gyp:irt_core_nexe', |
| 27 '../src/untrusted/irt_stub/irt_stub.gyp:*', |
| 28 '../src/untrusted/nacl/nacl.gyp:*', |
| 29 '../src/untrusted/nosys/nosys.gyp:*', |
| 30 '../src/untrusted/pthread/pthread.gyp:*', |
| 26 ], | 31 ], |
| 27 'conditions': [ | 32 'conditions': [ |
| 33 # No tests on ARM yet. |
| 28 ['target_arch!="arm"', { | 34 ['target_arch!="arm"', { |
| 29 'dependencies': [ | 35 'dependencies': [ |
| 30 '../src/untrusted/irt/irt.gyp:irt_core_nexe', | |
| 31 '../src/untrusted/irt_stub/irt_stub.gyp:*', | |
| 32 '../src/untrusted/nacl/nacl.gyp:*', | |
| 33 '../src/untrusted/nosys/nosys.gyp:*', | |
| 34 '../src/untrusted/pthread/pthread.gyp:*', | |
| 35 '../tests.gyp:*', | 36 '../tests.gyp:*', |
| 36 ], | 37 ], |
| 37 }], | 38 }], |
| 38 ['target_arch=="arm"', { | 39 ['target_arch=="arm"', { |
| 39 'dependencies': [ | 40 'dependencies': [ |
| 40 '../src/trusted/validator_arm/validator_arm.gyp:*', | 41 '../src/trusted/validator_arm/validator_arm.gyp:*', |
| 41 ], | 42 ], |
| 42 }, { | 43 }, { |
| 43 'dependencies': [ | 44 'dependencies': [ |
| 44 '../src/trusted/validator_x86/validator_x86.gyp:*', | 45 '../src/trusted/validator_x86/validator_x86.gyp:*', |
| 45 ], | 46 ], |
| 46 }], | 47 }], |
| 47 ['OS=="win" and nacl_standalone==0', { | 48 ['OS=="win" and nacl_standalone==0', { |
| 48 'dependencies': [ | 49 'dependencies': [ |
| 49 '../src/trusted/handle_pass/handle_pass.gyp:*', | 50 '../src/trusted/handle_pass/handle_pass.gyp:*', |
| 50 ], | 51 ], |
| 51 }], | 52 }], |
| 52 ], | 53 ], |
| 53 }, | 54 }, |
| 54 ], | 55 ], |
| 55 } | 56 } |
| OLD | NEW |