third_party/mojo/src/mojo/public/mojo_application.gni - Issue 910883002: Update mojo sdk to rev 8af2ccff2eee4bfca1043015abee30482a030b30

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_application.gni

Issue 910883002: Update mojo sdk to rev 8af2ccff2eee4bfca1043015abee30482a030b30 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Apply 9f87aeadbda22441b7d469e596f7bd7d0d73e2a8 (https://codereview.chromium.org/908973002/) 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/connection.js ('k') | third_party/mojo/src/mojo/public/python/mojo_bindings/reflection.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/mojo/src/mojo/public/mojo_application.gni

diff --git a/third_party/mojo/src/mojo/public/mojo_application.gni b/third_party/mojo/src/mojo/public/mojo_application.gni

index 19abf7410ab3e4370a43b21094ab69e43395d62e..7661c8885625444b1b6a087f8750409bbcfb84e4 100644

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

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

@@ -74,16 +74,14 @@ template("mojo_native_application") {

}

# Copy the prebuilt mojo_shell if using it.

- if (defined(invoker.datadeps)) {

- datadeps = invoker.datadeps

+ if (defined(invoker.data_deps)) {

+ data_deps = invoker.data_deps

if (use_prebuilt_mojo_shell) {

- datadeps += [ copy_mojo_shell ]

+ data_deps += [ copy_mojo_shell ]

}

} else {

if (use_prebuilt_mojo_shell) {

- datadeps = [

- copy_mojo_shell,

- ]

+ data_deps = [ copy_mojo_shell ]

}

deps = rebase_path([