Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(911)

Unified Diff: ppapi/native_client/BUILD.gn

Issue 1333673002: Build PPAPI NaCl Glibc tests with GN (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ppapi/BUILD.gn ('k') | ppapi/native_client/src/untrusted/irt_stub/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ppapi/native_client/BUILD.gn
diff --git a/ppapi/native_client/BUILD.gn b/ppapi/native_client/BUILD.gn
index 23a23714d3f565a73ab83951cd18bb0cfc69a654..a67d7e7c286f98b3e45966e248566dd0e9ae135e 100644
--- a/ppapi/native_client/BUILD.gn
+++ b/ppapi/native_client/BUILD.gn
@@ -3,13 +3,17 @@
# found in the LICENSE file.
import("//build/config/features.gni")
+import("//build/config/nacl/config.gni")
if (is_nacl) {
group("ppapi_lib") {
deps = [
- "//native_client/src/untrusted/pthread",
"//ppapi/native_client/src/untrusted/irt_stub:ppapi_stub_lib",
]
+ if (!is_nacl_glibc) {
+ # Glibc has its version of pthread library.
+ deps += [ "//native_client/src/untrusted/pthread" ]
+ }
}
executable("nacl_irt") {
@@ -59,7 +63,5 @@ if (is_nacl) {
}
group("irt") {
- deps = [
- ":nacl_irt_copy(//build/toolchain/nacl:irt_${target_cpu})",
- ]
+ data_deps = [ ":nacl_irt_copy(//build/toolchain/nacl:irt_${target_cpu})" ]
}
« no previous file with comments | « ppapi/BUILD.gn ('k') | ppapi/native_client/src/untrusted/irt_stub/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698