| 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:*', |
| (...skipping 13 matching lines...) Expand all Loading... |
| 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 ], | 26 ], |
| 27 'conditions': [ | 27 'conditions': [ |
| 28 ['target_arch!="arm"', { | 28 ['target_arch!="arm"', { |
| 29 'dependencies': [ | 29 'dependencies': [ |
| 30 '../src/untrusted/irt/irt.gyp:irt_core_nexe', | 30 '../src/untrusted/irt/irt.gyp:irt_core_nexe', |
| 31 '../src/untrusted/irt_stub/irt_stub.gyp:*', | 31 '../src/untrusted/irt_stub/irt_stub.gyp:*', |
| 32 '../src/untrusted/nacl/nacl.gyp:*', | 32 '../src/untrusted/nacl/nacl.gyp:*', |
| 33 '../src/untrusted/nosys/nosys.gyp:*', | 33 '../src/untrusted/nosys/nosys.gyp:*', |
| 34 # TODO(jvoung): This doesn't quite work yet -- see the gyp file for details. |
| 35 # http://code.google.com/p/nativeclient/issues/detail?id=2465 |
| 36 # '../src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp:*', |
| 34 '../src/untrusted/pthread/pthread.gyp:*', | 37 '../src/untrusted/pthread/pthread.gyp:*', |
| 35 '../tests.gyp:*', | 38 '../tests.gyp:*', |
| 36 ], | 39 ], |
| 37 }], | 40 }], |
| 38 ['target_arch=="arm"', { | 41 ['target_arch=="arm"', { |
| 39 'dependencies': [ | 42 'dependencies': [ |
| 40 '../src/trusted/validator_arm/validator_arm.gyp:*', | 43 '../src/trusted/validator_arm/validator_arm.gyp:*', |
| 41 ], | 44 ], |
| 42 }, { | 45 }, { |
| 43 'dependencies': [ | 46 'dependencies': [ |
| 44 '../src/trusted/validator_x86/validator_x86.gyp:*', | 47 '../src/trusted/validator_x86/validator_x86.gyp:*', |
| 45 ], | 48 ], |
| 46 }], | 49 }], |
| 47 ['OS=="win" and nacl_standalone==0', { | 50 ['OS=="win" and nacl_standalone==0', { |
| 48 'dependencies': [ | 51 'dependencies': [ |
| 49 '../src/trusted/handle_pass/handle_pass.gyp:*', | 52 '../src/trusted/handle_pass/handle_pass.gyp:*', |
| 50 ], | 53 ], |
| 51 }], | 54 }], |
| 52 ], | 55 ], |
| 53 }, | 56 }, |
| 54 ], | 57 ], |
| 55 } | 58 } |
| OLD | NEW |