third_party/mojo/src/mojo/public/tools/BUILD.gn - Issue 1127293003: Update mojo sdk to rev f84766d3b6420b7cf6a113d9d65d73cb5fe18d90

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/tools/BUILD.gn

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

Patch Set: formatting Created 5 years, 7 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/python/mojo_bindings/reflection.py ('k') | third_party/mojo/src/mojo/public/tools/NETWORK_SERVICE_VERSION » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/mojo/src/mojo/public/tools/BUILD.gn

diff --git a/third_party/mojo/src/mojo/public/tools/BUILD.gn b/third_party/mojo/src/mojo/public/tools/BUILD.gn

index 8b47bb91dacc98485f2e3277c3ba5ccc3688089f..9850a175d6dde025feb4531eb1018baff7fd8f19 100644

--- a/third_party/mojo/src/mojo/public/tools/BUILD.gn

+++ b/third_party/mojo/src/mojo/public/tools/BUILD.gn

@@ -38,7 +38,7 @@ if (mojo_use_prebuilt_network_service) {

]

} else {

if (is_android) {

- assert(cpu_arch == "arm",

+ assert(current_cpu == "arm",

"Only arm version prebuilt netowrk_service.mojo is available.")

sources = [

"prebuilt/network_service/android-arm/$filename",

@@ -66,7 +66,7 @@ if (mojo_use_prebuilt_network_service) {

} else {

if (is_android) {

assert(

- cpu_arch == "arm",

+ target_cpu == "arm",

"Only arm version prebuilt netowrk_service_apptests.mojo is available.")

sources = [

"prebuilt/network_service_apptests/android-arm/$filename",