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

Unified Diff: third_party/mojo/src/mojo/public/mojo.gni

Issue 917433003: Update mojo sdk to rev 1027d24a1f68c6d10b7539b32114f1272b2cc9f1 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add //build/module_args/mojo.gni. Created 5 years, 10 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/mojo.gni
diff --git a/third_party/mojo/src/mojo/public/mojo.gni b/third_party/mojo/src/mojo/public/mojo.gni
index b87c4639e9277ad5f240ba1749ca964acae071d8..9f1b86b7d203dab69125d1c54555de3066e831d0 100644
--- a/third_party/mojo/src/mojo/public/mojo.gni
+++ b/third_party/mojo/src/mojo/public/mojo.gni
@@ -2,10 +2,12 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-declare_args() {
- # Whether to use a prebuilt mojo_shell binary instead of one built from
- # source.
- use_prebuilt_mojo_shell = false
+import("//build/module_args/mojo.gni")
+
+# If using the prebuilt shell, gate its usage by the platforms for which it is
+# published.
+if (!defined(use_prebuilt_mojo_shell) || use_prebuilt_mojo_shell) {
+ use_prebuilt_mojo_shell = is_linux || is_android
}
# The absolute path to the directory containing the mojo public SDK (i.e., the

Powered by Google App Engine
This is Rietveld 408576698