| 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 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 73 '../base/base.gyp:base', | 73 '../base/base.gyp:base', |
| 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 '../native_client/src/trusted/service_runtime/service_runtime.gyp:se
l', | 76 '../native_client/src/trusted/service_runtime/service_runtime.gyp:se
l', |
| 77 '../native_client/src/trusted/platform_qualify/platform_qualify.gyp:
platform_qual_lib', | 77 '../native_client/src/trusted/platform_qualify/platform_qualify.gyp:
platform_qual_lib', |
| 78 ], | 78 ], |
| 79 'conditions': [ | 79 'conditions': [ |
| 80 ['disable_nacl_untrusted==0', { | 80 ['disable_nacl_untrusted==0', { |
| 81 'dependencies': [ | 81 'dependencies': [ |
| 82 '../ppapi/native_client/native_client.gyp:nacl_irt', | 82 '../ppapi/native_client/native_client.gyp:nacl_irt', |
| 83 ], | |
| 84 }], | |
| 85 ['disable_nacl_untrusted==0 and target_arch!="arm"', { | |
| 86 'dependencies': [ | |
| 87 '../ppapi/native_client/native_client.gyp:nacl_ipc_irt', | 83 '../ppapi/native_client/native_client.gyp:nacl_ipc_irt', |
| 88 ], | 84 ], |
| 89 }], | 85 }], |
| 90 ], | 86 ], |
| 91 'direct_dependent_settings': { | 87 'direct_dependent_settings': { |
| 92 'defines': [ | 88 'defines': [ |
| 93 '<@(nacl_defines)', | 89 '<@(nacl_defines)', |
| 94 ], | 90 ], |
| 95 }, | 91 }, |
| 96 }, | 92 }, |
| (...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 200 'target_name': 'nacl_win64', | 196 'target_name': 'nacl_win64', |
| 201 'type': 'none', | 197 'type': 'none', |
| 202 'sources': [], | 198 'sources': [], |
| 203 }, | 199 }, |
| 204 ], | 200 ], |
| 205 }], | 201 }], |
| 206 ], | 202 ], |
| 207 }], | 203 }], |
| 208 ], | 204 ], |
| 209 } | 205 } |
| OLD | NEW |