summaryrefslogtreecommitdiffstats
path: root/ppapi
diff options
context:
space:
mode:
authorphosek <phosek@chromium.org>2016-01-14 15:22:51 -0800
committerCommit bot <commit-bot@chromium.org>2016-01-14 23:23:51 +0000
commitd07c771832f9dc9ee1957a7ccf467df4f48a360a (patch)
treeba46344e403c1345a758664bc0e5e2bf39da8ae1 /ppapi
parent1fb84154cb338bcf295346ecd938b75865ade649 (diff)
downloadchromium_src-d07c771832f9dc9ee1957a7ccf467df4f48a360a.zip
chromium_src-d07c771832f9dc9ee1957a7ccf467df4f48a360a.tar.gz
chromium_src-d07c771832f9dc9ee1957a7ccf467df4f48a360a.tar.bz2
GN: Only link libppapi_cpp.so where necessary
Some tests check the libraries and symbols linked into the nexe and to make these pass, we need to replicate the GYP behavior. BUG=462791 Review URL: https://codereview.chromium.org/1583043002 Cr-Commit-Position: refs/heads/master@{#369604}
Diffstat (limited to 'ppapi')
-rw-r--r--ppapi/native_client/nacl_test_data.gni5
1 files changed, 4 insertions, 1 deletions
diff --git a/ppapi/native_client/nacl_test_data.gni b/ppapi/native_client/nacl_test_data.gni
index 265e4a0..8b2e7a1 100644
--- a/ppapi/native_client/nacl_test_data.gni
+++ b/ppapi/native_client/nacl_test_data.gni
@@ -90,9 +90,12 @@ template("nacl_test_data") {
"libs",
])
deps = [
- "//ppapi:ppapi_cpp_lib",
+ "//build/config/nacl:nacl_base",
"//ppapi/native_client:ppapi_lib",
]
+ if (!is_nacl_glibc) {
+ deps += [ "//ppapi:ppapi_cpp_lib" ]
+ }
ldflags = [ "-pthread" ]
if (defined(invoker.deps)) {
deps += invoker.deps