Index: mojo/public/mojo.gni |
diff --git a/mojo/public/mojo.gni b/mojo/public/mojo.gni |
index 9f1b86b7d203dab69125d1c54555de3066e831d0..073da012483a4481cc0db4fd9365933416e6be84 100644 |
--- a/mojo/public/mojo.gni |
+++ b/mojo/public/mojo.gni |
@@ -10,6 +10,14 @@ if (!defined(use_prebuilt_mojo_shell) || use_prebuilt_mojo_shell) { |
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. |
+if (!defined(use_prebuilt_network_service) || use_prebuilt_network_service) { |
+ # The prebuilt Mojo shell packages the network service on Android. |
ppi
2015/02/10 16:49:50
nit: I think s/packages/contains/ would stress tha
blundell
2015/02/11 21:06:17
Done.
|
+ use_prebuilt_network_service = |
+ is_linux || (is_android && !use_prebuilt_mojo_shell) |
ppi
2015/02/10 16:49:50
Is this part needed? On Android the choice to pull
blundell
2015/02/11 21:06:17
My thought is that it's weird and a little confusi
ppi
2015/02/12 13:36:49
Right, but isn't building it locally when it's nev
blundell
2015/02/12 13:57:41
Yes, you're right (I think you meant *more* weird)
|
+} |
+ |
# The absolute path to the directory containing the mojo public SDK (i.e., the |
# directory containing mojo/public). The build files within the Mojo public |
# SDK use this variable to allow themselves to be parameterized by the location |