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

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

Issue 921053003: Add option to allow mojob to specify extra gn args. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: fix for qsr's review 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
« no previous file with comments | « no previous file | mojo/tools/mojob.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/public/tools/BUILD.gn
diff --git a/mojo/public/tools/BUILD.gn b/mojo/public/tools/BUILD.gn
index e584e1f41b1dd30dfd74249f817efc640c71fd48..30c146d43f46ecae42e66fb0a7373bf227b54ee0 100644
--- a/mojo/public/tools/BUILD.gn
+++ b/mojo/public/tools/BUILD.gn
@@ -31,16 +31,26 @@ if (use_prebuilt_mojo_shell) {
if (use_prebuilt_network_service) {
copy("copy_network_service") {
filename = "network_service.mojo"
- if (is_android) {
+ if (defined(prebuilt_network_service_location) &&
+ prebuilt_network_service_location != "") {
sources = [
- "prebuilt/network_service/android-arm/$filename",
+ "$prebuilt_network_service_location",
]
} else {
- assert(is_linux)
- sources = [
- "prebuilt/network_service/linux-x64/$filename",
- ]
+ if (is_android) {
+ assert(cpu_arch == "arm",
+ "Only arm version prebuilt netowrk_service.mojo is available.")
+ sources = [
+ "prebuilt/network_service/android-arm/$filename",
+ ]
+ } else {
+ assert(is_linux)
+ sources = [
+ "prebuilt/network_service/linux-x64/$filename",
+ ]
+ }
}
+
outputs = [
"$root_out_dir/$filename",
]
« no previous file with comments | « no previous file | mojo/tools/mojob.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698