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

Unified Diff: third_party/mojo/src/mojo/public/tools/BUILD.gn

Issue 1058033002: NOT TO COMMITTED: Update mojo sdk to rev 0018e6a91b75bcb941c867f8a7aa1753c3b53a13 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 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
Index: third_party/mojo/src/mojo/public/tools/BUILD.gn
diff --git a/third_party/mojo/src/mojo/public/tools/BUILD.gn b/third_party/mojo/src/mojo/public/tools/BUILD.gn
index 9344cf31027420146cee303312892347276493fd..8b47bb91dacc98485f2e3277c3ba5ccc3688089f 100644
--- a/third_party/mojo/src/mojo/public/tools/BUILD.gn
+++ b/third_party/mojo/src/mojo/public/tools/BUILD.gn
@@ -58,15 +58,25 @@ if (mojo_use_prebuilt_network_service) {
copy("copy_network_service_apptests") {
filename = "network_service_apptests.mojo"
- if (is_android) {
+ if (defined(mojo_prebuilt_network_service_apptests_location) &&
+ mojo_prebuilt_network_service_apptests_location != "") {
sources = [
- "prebuilt/network_service_apptests/android-arm/$filename",
+ "$mojo_prebuilt_network_service_apptests_location",
]
} else {
- assert(is_linux)
- sources = [
- "prebuilt/network_service_apptests/linux-x64/$filename",
- ]
+ if (is_android) {
+ assert(
+ cpu_arch == "arm",
+ "Only arm version prebuilt netowrk_service_apptests.mojo is available.")
+ sources = [
+ "prebuilt/network_service_apptests/android-arm/$filename",
+ ]
+ } else {
+ assert(is_linux)
+ sources = [
+ "prebuilt/network_service_apptests/linux-x64/$filename",
+ ]
+ }
}
outputs = [
"$root_out_dir/$filename",

Powered by Google App Engine
This is Rietveld 408576698