build/all.gyp - Issue 816543004: Update from https://crrev.com/308996

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: build/all.gyp

Issue 816543004: Update from https://crrev.com/308996 (Closed) Base URL: git@github.com:domokit/mojo.git@master

Patch Set: Created 6 years 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: build/all.gyp

diff --git a/build/all.gyp b/build/all.gyp

index 5f06ae0826ac6f78fa978a73dd550021a9dc2f85..9316b49ca83a11da0734954c6c4e41e02aeda7e8 100644

--- a/build/all.gyp

+++ b/build/all.gyp

@@ -44,22 +44,23 @@

['OS=="ios"', {

'dependencies': [

'../chrome/chrome.gyp:browser',

+ '../chrome/chrome.gyp:browser_ui',

'../ios/ios.gyp:*',

# NOTE: This list of targets is present because

# mojo_base.gyp:mojo_base cannot be built on iOS, as

# javascript-related targets cause v8 to be built.

- '../mojo/edk/mojo_edk_tests.gyp:mojo_public_bindings_unittests',

- '../mojo/edk/mojo_edk_tests.gyp:mojo_public_environment_unittests',

- '../mojo/edk/mojo_edk_tests.gyp:mojo_public_system_perftests',

- '../mojo/edk/mojo_edk_tests.gyp:mojo_public_system_unittests',

- '../mojo/edk/mojo_edk_tests.gyp:mojo_public_utility_unittests',

- '../mojo/edk/mojo_edk.gyp:mojo_system_impl',

- '../mojo/edk/mojo_edk_tests.gyp:mojo_system_unittests',

'../mojo/mojo_base.gyp:mojo_common_lib',

'../mojo/mojo_base.gyp:mojo_common_unittests',

- '../mojo/public/mojo_public.gyp:mojo_cpp_bindings',

- '../mojo/public/mojo_public.gyp:mojo_public_test_utils',

- '../mojo/public/mojo_public.gyp:mojo_system',

+ '../mojo/mojo_edk.gyp:mojo_system_impl',

+ '../mojo/mojo_edk_tests.gyp:mojo_public_bindings_unittests',

+ '../mojo/mojo_edk_tests.gyp:mojo_public_environment_unittests',

+ '../mojo/mojo_edk_tests.gyp:mojo_public_system_perftests',

+ '../mojo/mojo_edk_tests.gyp:mojo_public_system_unittests',

+ '../mojo/mojo_edk_tests.gyp:mojo_public_utility_unittests',

+ '../mojo/mojo_edk_tests.gyp:mojo_system_unittests',

+ '../mojo/mojo_public.gyp:mojo_cpp_bindings',

+ '../mojo/mojo_public.gyp:mojo_public_test_utils',

+ '../mojo/mojo_public.gyp:mojo_system',

'../google_apis/google_apis.gyp:google_apis_unittests',

'../ui/base/ui_base_tests.gyp:ui_base_unittests',

'../ui/ios/ui_ios_tests.gyp:ui_ios_unittests',

« no previous file with comments | « base/tuple.h ('k') | build/android/PRESUBMIT.py » ('j') | no next file with comments »