| 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 '../../build/common_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', { |
| (...skipping 18 matching lines...) Expand all Loading... |
| 29 }, | 29 }, |
| 30 | 30 |
| 31 { | 31 { |
| 32 'destination': '>(tc_lib_dir_pnacl_newlib)', | 32 'destination': '>(tc_lib_dir_pnacl_newlib)', |
| 33 'files': [ | 33 'files': [ |
| 34 'src/untrusted/irt_stub/libppapi.a', | 34 'src/untrusted/irt_stub/libppapi.a', |
| 35 ], | 35 ], |
| 36 }, | 36 }, |
| 37 ], | 37 ], |
| 38 'conditions': [ | 38 'conditions': [ |
| 39 ['target_arch!="arm"', { | 39 ['target_arch=="ia32" or target_arch=="x64"', { |
| 40 'copies': [ | 40 'copies': [ |
| 41 { | 41 { |
| 42 'destination': '>(tc_include_dir_glibc)/include/nacl', | 42 'destination': '>(tc_include_dir_glibc)/include/nacl', |
| 43 'files': [ | 43 'files': [ |
| 44 'src/trusted/weak_ref/call_on_main_thread.h', | 44 'src/trusted/weak_ref/call_on_main_thread.h', |
| 45 'src/shared/ppapi_proxy/ppruntime.h', | 45 'src/shared/ppapi_proxy/ppruntime.h', |
| 46 ], | 46 ], |
| 47 }, | 47 }, |
| 48 # Here we copy linker scripts out of the Native Client repo.. | 48 # Here we copy linker scripts out of the Native Client repo.. |
| 49 # These are source, not build artifacts. | 49 # These are source, not build artifacts. |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 90 { | 90 { |
| 91 'target_name': 'nacl_irt', | 91 'target_name': 'nacl_irt', |
| 92 'type': 'none', | 92 'type': 'none', |
| 93 'variables': { | 93 'variables': { |
| 94 'nexe_target': 'nacl_irt', | 94 'nexe_target': 'nacl_irt', |
| 95 # These out_* fields override the default filenames, which | 95 # These out_* fields override the default filenames, which |
| 96 # include a "_newlib" suffix. | 96 # include a "_newlib" suffix. |
| 97 'out_newlib64': '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe', | 97 'out_newlib64': '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe', |
| 98 'out_newlib32': '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe', | 98 'out_newlib32': '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe', |
| 99 'out_newlib_arm': '<(PRODUCT_DIR)/nacl_irt_arm.nexe', | 99 'out_newlib_arm': '<(PRODUCT_DIR)/nacl_irt_arm.nexe', |
| 100 'out_newlib_mips': '<(PRODUCT_DIR)/nacl_irt_mips32.nexe', |
| 100 'build_glibc': 0, | 101 'build_glibc': 0, |
| 101 'build_newlib': 0, | 102 'build_newlib': 0, |
| 102 'build_irt': 1, | 103 'build_irt': 1, |
| 103 'include_dirs': [ | 104 'include_dirs': [ |
| 104 'lib/gl/include', | 105 'lib/gl/include', |
| 105 '..', | 106 '..', |
| 106 ], | 107 ], |
| 107 'link_flags': [ | 108 'link_flags': [ |
| 108 '-Wl,--start-group', | 109 '-Wl,--start-group', |
| 109 '-lirt_browser', | 110 '-lirt_browser', |
| (...skipping 28 matching lines...) Expand all Loading... |
| 138 ['OS!="win" and target_arch=="ia32"', | 139 ['OS!="win" and target_arch=="ia32"', |
| 139 { | 140 { |
| 140 'enable_x86_64': 0 | 141 'enable_x86_64': 0 |
| 141 } | 142 } |
| 142 ], | 143 ], |
| 143 ['target_arch=="x64"', | 144 ['target_arch=="x64"', |
| 144 { | 145 { |
| 145 'enable_x86_32': 0 | 146 'enable_x86_32': 0 |
| 146 } | 147 } |
| 147 ], | 148 ], |
| 148 ['target_arch!="arm"', { | 149 ['target_arch=="ia32" or target_arch=="x64"', { |
| 149 'extra_deps_newlib64': [ | 150 'extra_deps_newlib64': [ |
| 150 '>(tc_lib_dir_irt64)/libppapi_proxy_untrusted.a', | 151 '>(tc_lib_dir_irt64)/libppapi_proxy_untrusted.a', |
| 151 '>(tc_lib_dir_irt64)/libppapi_ipc_untrusted.a', | 152 '>(tc_lib_dir_irt64)/libppapi_ipc_untrusted.a', |
| 152 '>(tc_lib_dir_irt64)/libppapi_shared_untrusted.a', | 153 '>(tc_lib_dir_irt64)/libppapi_shared_untrusted.a', |
| 153 '>(tc_lib_dir_irt64)/libgles2_implementation_untrusted.a', | 154 '>(tc_lib_dir_irt64)/libgles2_implementation_untrusted.a', |
| 154 '>(tc_lib_dir_irt64)/libcommand_buffer_client_untrusted.a', | 155 '>(tc_lib_dir_irt64)/libcommand_buffer_client_untrusted.a', |
| 155 '>(tc_lib_dir_irt64)/libcommand_buffer_common_untrusted.a', | 156 '>(tc_lib_dir_irt64)/libcommand_buffer_common_untrusted.a', |
| 156 '>(tc_lib_dir_irt64)/libgpu_ipc_untrusted.a', | 157 '>(tc_lib_dir_irt64)/libgpu_ipc_untrusted.a', |
| 157 '>(tc_lib_dir_irt64)/libtracing_untrusted.a', | 158 '>(tc_lib_dir_irt64)/libtracing_untrusted.a', |
| 158 '>(tc_lib_dir_irt64)/libgles2_cmd_helper_untrusted.a', | 159 '>(tc_lib_dir_irt64)/libgles2_cmd_helper_untrusted.a', |
| (...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 229 '../../native_client/src/shared/srpc/srpc.gyp:srpc_lib', | 230 '../../native_client/src/shared/srpc/srpc.gyp:srpc_lib', |
| 230 '../../native_client/src/shared/platform/platform.gyp:platform_lib', | 231 '../../native_client/src/shared/platform/platform.gyp:platform_lib', |
| 231 '../../native_client/src/untrusted/nacl/nacl.gyp:imc_syscalls_lib', | 232 '../../native_client/src/untrusted/nacl/nacl.gyp:imc_syscalls_lib', |
| 232 '../../native_client/src/shared/gio/gio.gyp:gio_lib', | 233 '../../native_client/src/shared/gio/gio.gyp:gio_lib', |
| 233 ], | 234 ], |
| 234 }, | 235 }, |
| 235 ], | 236 ], |
| 236 }], | 237 }], |
| 237 ], | 238 ], |
| 238 } | 239 } |
| OLD | NEW |