| 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 'includes': [ | 6 'includes': [ |
| 7 '../../native_client/build/untrusted.gypi', | 7 '../../build/common_untrusted.gypi', |
| 8 ], | 8 ], |
| 9 'conditions': [ | 9 'conditions': [ |
| 10 ['disable_nacl==0 and disable_nacl_untrusted==0', { | 10 ['disable_nacl==0 and disable_nacl_untrusted==0', { |
| 11 'targets': [ | 11 'targets': [ |
| 12 { | 12 { |
| 13 'target_name': 'ppapi_lib', | 13 'target_name': 'ppapi_lib', |
| 14 'type': 'none', | 14 'type': 'none', |
| 15 'dependencies': [ | 15 'dependencies': [ |
| 16 '../../native_client/src/untrusted/pthread/pthread.gyp:pthread_lib'
, | 16 '../../native_client/src/untrusted/pthread/pthread.gyp:pthread_lib'
, |
| 17 '../../native_client/src/untrusted/irt_stub/irt_stub.gyp:ppapi_stub
_lib', | 17 '../../native_client/src/untrusted/irt_stub/irt_stub.gyp:ppapi_stub
_lib', |
| (...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 170 }, | 170 }, |
| 171 'dependencies': [ | 171 'dependencies': [ |
| 172 'src/shared/ppapi_proxy/ppapi_proxy_untrusted.gyp:ppruntime_lib', | 172 'src/shared/ppapi_proxy/ppapi_proxy_untrusted.gyp:ppruntime_lib', |
| 173 '../../native_client/src/untrusted/irt/irt.gyp:irt_browser_lib', | 173 '../../native_client/src/untrusted/irt/irt.gyp:irt_browser_lib', |
| 174 '../../native_client/src/shared/srpc/srpc.gyp:srpc_lib', | 174 '../../native_client/src/shared/srpc/srpc.gyp:srpc_lib', |
| 175 '../../native_client/src/shared/platform/platform.gyp:platform_lib', | 175 '../../native_client/src/shared/platform/platform.gyp:platform_lib', |
| 176 '../../native_client/src/untrusted/nacl/nacl.gyp:imc_syscalls_lib', | 176 '../../native_client/src/untrusted/nacl/nacl.gyp:imc_syscalls_lib', |
| 177 '../../native_client/src/shared/gio/gio.gyp:gio_lib', | 177 '../../native_client/src/shared/gio/gio.gyp:gio_lib', |
| 178 ], | 178 ], |
| 179 }, | 179 }, |
| 180 ], | |
| 181 }], | |
| 182 ['disable_nacl==0 and disable_nacl_untrusted==0 and target_arch!="arm"', { | |
| 183 'targets': [ | |
| 184 { | 180 { |
| 185 'target_name': 'nacl_ipc_irt', | 181 'target_name': 'nacl_ipc_irt', |
| 186 'type': 'none', | 182 'type': 'none', |
| 187 'variables': { | 183 'variables': { |
| 188 'nexe_target': 'nacl_ipc_irt', | 184 'nexe_target': 'nacl_ipc_irt', |
| 189 # These out_* fields override the default filenames, which | 185 # These out_* fields override the default filenames, which |
| 190 # include a "_newlib" suffix. | 186 # include a "_newlib" suffix. |
| 191 'out_newlib64': '<(PRODUCT_DIR)/nacl_ipc_irt_x86_64.nexe', | 187 'out_newlib64': '<(PRODUCT_DIR)/nacl_ipc_irt_x86_64.nexe', |
| 192 'out_newlib32': '<(PRODUCT_DIR)/nacl_ipc_irt_x86_32.nexe', | 188 'out_newlib32': '<(PRODUCT_DIR)/nacl_ipc_irt_x86_32.nexe', |
| 193 'out_newlib_arm': '<(PRODUCT_DIR)/nacl_ipc_irt_arm.nexe', | 189 'out_newlib_arm': '<(PRODUCT_DIR)/nacl_ipc_irt_arm.nexe', |
| (...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 383 '../../native_client/src/shared/srpc/srpc.gyp:srpc_lib', | 379 '../../native_client/src/shared/srpc/srpc.gyp:srpc_lib', |
| 384 '../../native_client/src/shared/platform/platform.gyp:platform_lib', | 380 '../../native_client/src/shared/platform/platform.gyp:platform_lib', |
| 385 '../../native_client/src/untrusted/nacl/nacl.gyp:imc_syscalls_lib', | 381 '../../native_client/src/untrusted/nacl/nacl.gyp:imc_syscalls_lib', |
| 386 '../../native_client/src/shared/gio/gio.gyp:gio_lib', | 382 '../../native_client/src/shared/gio/gio.gyp:gio_lib', |
| 387 ], | 383 ], |
| 388 }, | 384 }, |
| 389 ], | 385 ], |
| 390 }], | 386 }], |
| 391 ], | 387 ], |
| 392 } | 388 } |
| OLD | NEW |