chrome/android/chrome_apk.gyp - Issue 1234643002: customtabs: Convert to the new AIDL interface, temporarily imported.

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: chrome/android/chrome_apk.gyp

Issue 1234643002: customtabs: Convert to the new AIDL interface, temporarily imported. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Added VisibleForTesting to util only used for testing Created 5 years, 5 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 | « chrome/android/BUILD.gn ('k') | chrome/android/java/AndroidManifest.xml » ('j') | chrome/android/java/src/android/support/customtabs/CustomTabsIntent.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/chrome_apk.gyp

diff --git a/chrome/android/chrome_apk.gyp b/chrome/android/chrome_apk.gyp

index b2e53e83654c47a981d47c853a59c4c0960c352a..76815cf07a49372fc964acf9557423cfbca95181 100644

--- a/chrome/android/chrome_apk.gyp

+++ b/chrome/android/chrome_apk.gyp

@@ -23,16 +23,16 @@

'targets': [

{

- # GN: //chrome/android:custom_tabs_service_aidl

+ #GN: //chrome/android::custom_tabs_service_aidl

'target_name': 'custom_tabs_service_aidl',

'type': 'none',

'variables': {

- 'aidl_interface_file': 'java/src/org/chromium/chrome/browser/customtabs/common.aidl',

- 'aidl_import_include': 'java/src/org/chromium/chrome/browser/customtabs',

+ 'aidl_interface_file': 'java/src/android/support/customtabs/common.aidl',

+ 'aidl_import_include': 'java/src/android/support/customtabs',

'sources': [

- 'java/src/org/chromium/chrome/browser/customtabs/ICustomTabsConnectionCallback.aidl',

- 'java/src/org/chromium/chrome/browser/customtabs/ICustomTabsConnectionService.aidl',

+ 'java/src/android/support/customtabs/ICustomTabsCallback.aidl',

+ 'java/src/android/support/customtabs/ICustomTabsService.aidl',

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