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

Unified Diff: build/module_args/mojo.gni

Issue 1035933002: Update mojo sdk to rev 912f52f69dadbe1e3cf9576f26731863770bcfc3 (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
« no previous file with comments | « no previous file | third_party/mojo/src/mojo/edk/embedder/platform_channel_utils_posix.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/module_args/mojo.gni
diff --git a/build/module_args/mojo.gni b/build/module_args/mojo.gni
index c8343251ec3053e81f2913ffedfdfa8775d138b7..13853b3860d7475ebd68020b362ddec452ac7aa3 100644
--- a/build/module_args/mojo.gni
+++ b/build/module_args/mojo.gni
@@ -7,25 +7,26 @@ mojo_sdk_root = "//third_party/mojo/src"
# Chromium builds the network service from source, as it is the
# producer of the network service.
-build_network_service_from_source = true
+mojo_build_network_service_from_source = true
# Chromium does not build dart apptests. Disable any Mojo targets which
# depend on the apptest framework.
-disable_dart_apptest_framework = true
+mojo_disable_dart_apptest_framework = true
# Points to the directory network_service is built from.
-network_service_root = "//mojo/services"
+mojo_network_service_root = "//mojo/services"
declare_args() {
# Specify prebuilt network service mojo file location rather than download
# from gs://mojo.
#
- # This variable only used when build_network_service_from_source is false.
+ # This variable only used when mojo_build_network_service_from_source is
+ # false.
#
# Currently only android_arm and linux_64 available on gs://mojo, and no plan
# to support more(https://codereview.chromium.org/921873003).
# It is needed for developers works on other platforms like android_x86 and
# android_x64. And it is also useful for supportted platform as well when
# developer want to try its own version of network service files.
- prebuilt_network_service_location = ""
+ mojo_prebuilt_network_service_location = ""
}
« no previous file with comments | « no previous file | third_party/mojo/src/mojo/edk/embedder/platform_channel_utils_posix.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698