| 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 26 matching lines...) Expand all Loading... |
| 37 }], | 37 }], |
| 38 ['target_arch=="arm"', { | 38 ['target_arch=="arm"', { |
| 39 'dependencies': [ | 39 'dependencies': [ |
| 40 '../src/trusted/validator_arm/validator_arm.gyp:*', | 40 '../src/trusted/validator_arm/validator_arm.gyp:*', |
| 41 ], | 41 ], |
| 42 }, { | 42 }, { |
| 43 'dependencies': [ | 43 'dependencies': [ |
| 44 '../src/trusted/validator_x86/validator_x86.gyp:*', | 44 '../src/trusted/validator_x86/validator_x86.gyp:*', |
| 45 ], | 45 ], |
| 46 }], | 46 }], |
| 47 ['target_arch=="x64" or OS=="win"', { |
| 48 # This library is only for x86-64 for now |
| 49 # (the windows build always includes 64-bit). |
| 50 # We may introduce a dummy shim to make it uniform. |
| 51 'dependencies': [ |
| 52 # '../src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp:*', |
| 53 '../../ppapi/pnacl_irt_shim.gyp:*', |
| 54 ], |
| 55 }], |
| 47 ['OS=="win" and nacl_standalone==0', { | 56 ['OS=="win" and nacl_standalone==0', { |
| 48 'dependencies': [ | 57 'dependencies': [ |
| 49 '../src/trusted/handle_pass/handle_pass.gyp:*', | 58 '../src/trusted/handle_pass/handle_pass.gyp:*', |
| 50 ], | 59 ], |
| 51 }], | 60 }], |
| 52 ], | 61 ], |
| 53 }, | 62 }, |
| 54 ], | 63 ], |
| 55 } | 64 } |
| OLD | NEW |