build/all.gyp - Issue 1141283003: Upstream oodles of Chrome for Android code into Chromium.

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 1141283003: Upstream oodles of Chrome for Android code into Chromium. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: final patch? 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

Index: build/all.gyp

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

index 04ba3f889c9e20c25c12a56bf93bbf778a70912e..22cd8dddc88dd95d1246d4fc77b610e13629059c 100644

--- a/build/all.gyp

+++ b/build/all.gyp

@@ -87,6 +87,7 @@

'../android_webview/android_webview.gyp:system_webview_apk',

'../android_webview/android_webview_shell.gyp:android_webview_shell_apk',

'../android_webview/android_webview_telemetry_shell.gyp:android_webview_telemetry_shell_apk',

+ '../chrome/android/chrome_apk.gyp:chrome_public_apk',

'../chrome/chrome.gyp:chrome_shell_apk',

'../chrome/chrome.gyp:chrome_sync_shell_apk',

'../remoting/remoting.gyp:remoting_apk',

@@ -876,6 +877,7 @@

# Unit test bundles packaged as an apk.

'../android_webview/android_webview.gyp:android_webview_test_apk',

'../android_webview/android_webview.gyp:android_webview_unittests_apk',

+ '../chrome/android/chrome_apk.gyp:chrome_public_test_apk',

'../chrome/chrome.gyp:chrome_junit_tests',

'../chrome/chrome.gyp:chrome_shell_test_apk',

'../chrome/chrome.gyp:chrome_sync_shell_test_apk',

« no previous file with comments | « no previous file | chrome/android/chrome_apk.gyp » ('j') | no next file with comments »