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

Unified Diff: third_party/mojo/src/mojo/public/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 | « third_party/mojo/src/mojo/public/VERSION ('k') | third_party/mojo/src/mojo/public/mojo_application.gni » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/mojo/src/mojo/public/mojo.gni
diff --git a/third_party/mojo/src/mojo/public/mojo.gni b/third_party/mojo/src/mojo/public/mojo.gni
index b8676e6bceba230a7bc421ce0da31cc5407ca1ce..f2631a0b466cfaf09e1e89c1693b704fac71391e 100644
--- a/third_party/mojo/src/mojo/public/mojo.gni
+++ b/third_party/mojo/src/mojo/public/mojo.gni
@@ -6,23 +6,25 @@ import("//build/module_args/mojo.gni")
# If using the prebuilt shell, gate its usage by the platforms for which it is
# published.
-use_prebuilt_mojo_shell = false
-if (!defined(build_mojo_shell_from_source) || !build_mojo_shell_from_source) {
- use_prebuilt_mojo_shell = is_linux || is_android
+mojo_use_prebuilt_mojo_shell = false
+if (!defined(mojo_build_mojo_shell_from_source) ||
+ !mojo_build_mojo_shell_from_source) {
+ mojo_use_prebuilt_mojo_shell = is_linux || is_android
}
# If using the prebuilt network service, gate its usage by the platforms for
# which it is published.
-use_prebuilt_network_service = false
-if (!defined(build_network_service_from_source) ||
- !build_network_service_from_source) {
- use_prebuilt_network_service = is_linux || is_android
+mojo_use_prebuilt_network_service = false
+if (!defined(mojo_build_network_service_from_source) ||
+ !mojo_build_network_service_from_source) {
+ mojo_use_prebuilt_network_service = is_linux || is_android
}
# Enable Dart apptest framework by default.
-use_dart_apptest_framework = true
-if (defined(disable_dart_apptest_framework) && disable_dart_apptest_framework) {
- use_dart_apptest_framework = false
+mojo_use_dart_apptest_framework = true
+if (defined(mojo_disable_dart_apptest_framework) &&
+ mojo_disable_dart_apptest_framework) {
+ mojo_use_dart_apptest_framework = false
}
# The absolute path to the directory containing the mojo public SDK (i.e., the
« no previous file with comments | « third_party/mojo/src/mojo/public/VERSION ('k') | third_party/mojo/src/mojo/public/mojo_application.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698