Index: ppapi/native_client/native_client.gyp |
diff --git a/ppapi/native_client/native_client.gyp b/ppapi/native_client/native_client.gyp |
index 0eb192025fda0454ee48e8ab6c68015c9e148aa6..f43ad734187c31b0b7b3e844760f73f0432412bf 100644 |
--- a/ppapi/native_client/native_client.gyp |
+++ b/ppapi/native_client/native_client.gyp |
@@ -76,6 +76,8 @@ |
'-lsrpc', |
'-limc_syscalls', |
'-lplatform', |
+ '-lbase_untrusted', |
+ '-lshared_memory_support_untrusted', |
'-lgio', |
'-Wl,--end-group', |
'-lm', |
@@ -113,7 +115,9 @@ |
# 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', |
@@ -121,7 +125,9 @@ |
], |
'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', |
@@ -129,7 +135,9 @@ |
], |
'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', |
@@ -137,7 +145,9 @@ |
], |
'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', |
@@ -145,7 +155,9 @@ |
], |
'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', |
@@ -153,7 +165,9 @@ |
], |
'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', |
@@ -161,7 +175,9 @@ |
], |
'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', |
@@ -170,6 +186,8 @@ |
}, |
'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', |
@@ -206,6 +224,7 @@ |
'-lgpu_ipc_untrusted', |
'-lipc_untrusted', |
'-lbase_untrusted', |
+ '-lshared_memory_support_untrusted', |
'-lsrpc', |
'-limc_syscalls', |
'-lplatform', |
@@ -256,6 +275,7 @@ |
'<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libipc_untrusted.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', |
@@ -273,6 +293,7 @@ |
'<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libipc_untrusted.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', |
@@ -290,6 +311,7 @@ |
'<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libipc_untrusted.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', |
@@ -307,6 +329,7 @@ |
'<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libipc_untrusted.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', |
@@ -324,6 +347,7 @@ |
'<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64/libipc_untrusted.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', |
@@ -341,6 +365,7 @@ |
'<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32/libipc_untrusted.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', |
@@ -358,6 +383,7 @@ |
'<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm/libipc_untrusted.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', |
@@ -375,6 +401,7 @@ |
'../../gpu/gpu_untrusted.gyp:gpu_ipc_untrusted', |
'../../ipc/ipc_untrusted.gyp:ipc_untrusted', |
'../../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', |