third_party/custom_tabs_client/custom_tabs_client.gyp - Issue 1303023002: Use third_party/custom_tabs_client as the src for customtabs library

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/custom_tabs_client/custom_tabs_client.gyp

Issue 1303023002: Use third_party/custom_tabs_client as the src for customtabs library (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 4 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

« chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnection.java ('K') | « third_party/custom_tabs_client/README.chromium ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/custom_tabs_client/custom_tabs_client.gyp

diff --git a/third_party/custom_tabs_client/custom_tabs_client.gyp b/third_party/custom_tabs_client/custom_tabs_client.gyp

index 20d15cf08c34d999bd7bd3917309ed4f5be9e2c3..b1b458bbda15debfc5bd605f83e78d55953353b5 100644

--- a/third_party/custom_tabs_client/custom_tabs_client.gyp

+++ b/third_party/custom_tabs_client/custom_tabs_client.gyp

@@ -40,13 +40,13 @@

'java_in_dir_suffix': '',

'dependencies': [

- 'chrome_custom_tabs_service_aidl',

- '../android_tools/android_tools.gyp:android_support_annotations_javalib',

+ 'custom_tabs_service_aidl',

+ '../android_tools/android_tools.gyp:android_support_v13_javalib',

Benoit L 2015/08/21 11:20:47 Stupid question: Doesn't this bloat the final .dex

pasko 2015/08/21 11:54:57 content_java already depends on it :( Still a con

'includes': [ '../../build/java.gypi' ],

{

- 'target_name': "chrome_custom_tabs_service_aidl",

+ 'target_name': "custom_tabs_service_aidl",

'type': 'none',

'variables': {

'java_in_dir': 'src/customtabs/src/android/support/customtabs/',