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

Unified Diff: mojo/BUILD.gn

Issue 1359513002: Various fixes for 32-bit Linux GN builds that need to be tracked down. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: share snapshot_toolchain.gni 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
« chrome/test/base/js2gtest.gni ('K') | « chrome/test/base/js2gtest.gni ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/BUILD.gn
diff --git a/mojo/BUILD.gn b/mojo/BUILD.gn
index 2bb0214fecd4eb1585489d46ecb23772f78077ee..3c1431b0cd9ad6048e6dbbcb5c929714a120c696 100644
--- a/mojo/BUILD.gn
+++ b/mojo/BUILD.gn
@@ -11,9 +11,15 @@ group("mojo") {
":tests",
"//mojo/common",
"//mojo/services",
- "//third_party/mojo/src/mojo/public",
]
+ if (!(is_linux && target_cpu == "x86")) {
+ # TODO(GYP): Figure out if this needs to be supported. Right now
+ # it won't work on x86 official builds because it needs stuff in the
+ # sysroot that doesn't exist.
+ deps += [ "//third_party/mojo/src/mojo/public" ]
+ }
+
if (is_android) {
deps += [ "//mojo/android" ]
}
« chrome/test/base/js2gtest.gni ('K') | « chrome/test/base/js2gtest.gni ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698