third_party/mojo/src/mojo/public/mojo.gni - Issue 954643002: Update mojo sdk to rev 3d23dae011859a2aae49f1d1adde705c8e85d819

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 954643002: Update mojo sdk to rev 3d23dae011859a2aae49f1d1adde705c8e85d819 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: use run_renderer_in_process() 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

« no previous file with comments | « third_party/mojo/src/mojo/public/js/validation_unittests.js ('k') | third_party/mojo/src/mojo/public/mojo_application.gni » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | 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 9f1b86b7d203dab69125d1c54555de3066e831d0..bc90a236f9b52dbe39fbcb69f0c38a8b9560f9ee 100644

--- a/third_party/mojo/src/mojo/public/mojo.gni

+++ b/third_party/mojo/src/mojo/public/mojo.gni

@@ -6,10 +6,19 @@ 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 = false

+if (!defined(build_mojo_shell_from_source) || !build_mojo_shell_from_source) {

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

# 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