Index: ppapi/native_client/native_client.gyp |
diff --git a/ppapi/native_client/native_client.gyp b/ppapi/native_client/native_client.gyp |
index bb2451dfbab6b5ef562dc765e87e20ce45873427..83b5f2525d659f2c129b8ffa98e0b259c6b90bec 100644 |
--- a/ppapi/native_client/native_client.gyp |
+++ b/ppapi/native_client/native_client.gyp |
@@ -71,156 +71,6 @@ |
], |
}, |
{ |
- 'target_name': 'nacl_irt_srpc', |
- 'type': 'none', |
- 'variables': { |
- 'nexe_target': 'nacl_irt_srpc', |
- # These out_* fields override the default filenames, which |
- # include a "_newlib" suffix. |
- 'out_newlib64': '<(PRODUCT_DIR)/nacl_irt_srpc_x86_64.nexe', |
- 'out_newlib32': '<(PRODUCT_DIR)/nacl_irt_srpc_x86_32.nexe', |
- 'out_newlib_arm': '<(PRODUCT_DIR)/nacl_irt_srpc_arm.nexe', |
- 'build_glibc': 0, |
- 'build_newlib': 1, |
- 'include_dirs': [ |
- 'lib/gl/include', |
- '..', |
- ], |
- 'link_flags': [ |
- '-Wl,--start-group', |
- '-lirt_browser', |
- '-lppruntime', |
- '-lsrpc', |
- '-limc_syscalls', |
- '-lplatform', |
- '-lbase_untrusted', |
- '-lshared_memory_support_untrusted', |
- '-lgio', |
- '-Wl,--end-group', |
- '-lm', |
- ], |
- # See http://code.google.com/p/nativeclient/issues/detail?id=2691. |
- # The PNaCl linker (gold) does not implement the "-Ttext-segment" |
- # option. However, with the linker for x86, the "-Ttext" option |
- # does not affect the executable's base address. |
- # TODO(olonho): simplify flags handling and avoid duplication |
- # with NaCl logic. |
- 'conditions': [ |
- ['target_arch!="arm"', |
- { |
- 'sources': [ |
- ], |
- 'link_flags': [ |
- '-Wl,--section-start,.rodata=<(NACL_IRT_DATA_START)', |
- '-Wl,-Ttext-segment=<(NACL_IRT_TEXT_START)', |
- ] |
- }, { # target_arch == "arm" |
- # TODO(mcgrathr): This knowledge really belongs in |
- # native_client/src/untrusted/irt/irt.gyp instead of here. |
- # But that builds libirt_browser.a as bitcode, so a native |
- # object does not fit happily there. |
- 'sources': [ |
- '../../native_client/src/untrusted/irt/aeabi_read_tp.S', |
- ], |
- 'link_flags': [ |
- '-Wl,--section-start,.rodata=<(NACL_IRT_DATA_START)', |
- '-Wl,-Ttext=<(NACL_IRT_TEXT_START)', |
- '--pnacl-allow-native', |
- '-arch', 'arm', |
- '-Wt,-mtls-use-call', |
- '-Wl,--pnacl-irt-link', |
- ], |
- }, |
- ], |
- ], |
- 'extra_args': [ |
- '--strip-debug', |
- ], |
- # TODO(bradchen): get rid of extra_deps64 and extra_deps32 |
- # once native_client/build/untrusted.gypi no longer needs them. |
- 'extra_deps64': [ |
- '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libppruntime.a', |
- '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libbase_untrusted.a', |
- '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libirt_browser.a', |
- '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libshared_memory_support_untrusted.a', |
- '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libsrpc.a', |
- '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libplatform.a', |
- '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libimc_syscalls.a', |
- '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libgio.a', |
- ], |
- 'extra_deps32': [ |
- '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libppruntime.a', |
- '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libbase_untrusted.a', |
- '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libirt_browser.a', |
- '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libshared_memory_support_untrusted.a', |
- '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libsrpc.a', |
- '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libplatform.a', |
- '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libimc_syscalls.a', |
- '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libgio.a', |
- ], |
- 'extra_deps_newlib64': [ |
- '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libppruntime.a', |
- '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libbase_untrusted.a', |
- '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libirt_browser.a', |
- '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libshared_memory_support_untrusted.a', |
- '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libsrpc.a', |
- '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libplatform.a', |
- '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libimc_syscalls.a', |
- '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libgio.a', |
- ], |
- 'extra_deps_newlib32': [ |
- '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libppruntime.a', |
- '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libbase_untrusted.a', |
- '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libirt_browser.a', |
- '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libshared_memory_support_untrusted.a', |
- '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libsrpc.a', |
- '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libplatform.a', |
- '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libimc_syscalls.a', |
- '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libgio.a', |
- ], |
- 'extra_deps_glibc64': [ |
- '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64/libppruntime.a', |
- '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64/libbase_untrusted.a', |
- '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64/libirt_browser.a', |
- '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64/libshared_memory_support_untrusted.a', |
- '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64/libsrpc.a', |
- '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64/libplatform.a', |
- '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64/libimc_syscalls.a', |
- '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64/libgio.a', |
- ], |
- 'extra_deps_glibc32': [ |
- '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32/libppruntime.a', |
- '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32/libbase_untrusted.a', |
- '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32/libirt_browser.a', |
- '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32/libshared_memory_support_untrusted.a', |
- '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32/libsrpc.a', |
- '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32/libplatform.a', |
- '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32/libimc_syscalls.a', |
- '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32/libgio.a', |
- ], |
- 'extra_deps_arm': [ |
- '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm/libppruntime.a', |
- '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm/libbase_untrusted.a', |
- '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm/libirt_browser.a', |
- '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm/libshared_memory_support_untrusted.a', |
- '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm/libsrpc.a', |
- '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm/libplatform.a', |
- '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm/libimc_syscalls.a', |
- '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm/libgio.a', |
- ], |
- }, |
- 'dependencies': [ |
- 'src/shared/ppapi_proxy/ppapi_proxy_untrusted.gyp:ppruntime_lib', |
- '../../base/base_untrusted.gyp:base_untrusted', |
- '../../media/media_untrusted.gyp:shared_memory_support_untrusted', |
- '../../native_client/src/untrusted/irt/irt.gyp:irt_browser_lib', |
- '../../native_client/src/shared/srpc/srpc.gyp:srpc_lib', |
- '../../native_client/src/shared/platform/platform.gyp:platform_lib', |
- '../../native_client/src/untrusted/nacl/nacl.gyp:imc_syscalls_lib', |
- '../../native_client/src/shared/gio/gio.gyp:gio_lib', |
- ], |
- }, |
- { |
'target_name': 'nacl_irt', |
'type': 'none', |
'variables': { |