| OLD | NEW |
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 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 { | 5 { |
| 6 'include': [ | 6 'include': [ |
| 7 '../native_client/build/untrusted.gypi', | 7 '../native_client/build/untrusted.gypi', |
| 8 ], | 8 ], |
| 9 'target_defaults': { | 9 'target_defaults': { |
| 10 'variables': { | 10 'variables': { |
| (...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 74 '../ipc/ipc.gyp:ipc', | 74 '../ipc/ipc.gyp:ipc', |
| 75 '../ppapi/native_client/src/trusted/plugin/plugin.gyp:ppGoogleNaClPl
uginChrome', | 75 '../ppapi/native_client/src/trusted/plugin/plugin.gyp:ppGoogleNaClPl
uginChrome', |
| 76 '../ppapi/ppapi_internal.gyp:ppapi_shared', | 76 '../ppapi/ppapi_internal.gyp:ppapi_shared', |
| 77 '../ppapi/ppapi_internal.gyp:ppapi_ipc', | 77 '../ppapi/ppapi_internal.gyp:ppapi_ipc', |
| 78 '../native_client/src/trusted/service_runtime/service_runtime.gyp:se
l_main_chrome', | 78 '../native_client/src/trusted/service_runtime/service_runtime.gyp:se
l_main_chrome', |
| 79 ], | 79 ], |
| 80 'conditions': [ | 80 'conditions': [ |
| 81 ['disable_nacl_untrusted==0', { | 81 ['disable_nacl_untrusted==0', { |
| 82 'dependencies': [ | 82 'dependencies': [ |
| 83 '../ppapi/native_client/native_client.gyp:nacl_irt', | 83 '../ppapi/native_client/native_client.gyp:nacl_irt', |
| 84 # This is not a real build dependency, but just a way to |
| 85 # get a build-time sanity-check to run. We have it rather |
| 86 # than some other testing-only sort of place because the |
| 87 # CrOS builders only build the chrome and nacl_helper |
| 88 # targets and don't build chromium_builder_tests or any |
| 89 # such target, and those are the only bots we have that |
| 90 # do build for ARM. |
| 91 '../ppapi/native_client/irt_test.gyp:*', |
| 84 '../ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_s
him.gyp:pnacl_irt_shim', | 92 '../ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_s
him.gyp:pnacl_irt_shim', |
| 85 '../ppapi/native_client/native_client.gyp:nacl_ipc_irt', | 93 '../ppapi/native_client/native_client.gyp:nacl_ipc_irt', |
| 86 ], | 94 ], |
| 87 }], | 95 }], |
| 88 ], | 96 ], |
| 89 'direct_dependent_settings': { | 97 'direct_dependent_settings': { |
| 90 'defines': [ | 98 'defines': [ |
| 91 '<@(nacl_defines)', | 99 '<@(nacl_defines)', |
| 92 ], | 100 ], |
| 93 }, | 101 }, |
| (...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 202 'target_name': 'nacl_win64', | 210 'target_name': 'nacl_win64', |
| 203 'type': 'none', | 211 'type': 'none', |
| 204 'sources': [], | 212 'sources': [], |
| 205 }, | 213 }, |
| 206 ], | 214 ], |
| 207 }], | 215 }], |
| 208 ], | 216 ], |
| 209 }], | 217 }], |
| 210 ], | 218 ], |
| 211 } | 219 } |
| OLD | NEW |