Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(349)

Unified Diff: chrome/android/BUILD.gn

Issue 1303613002: Start using the third_party/android_tools target 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
« no previous file with comments | « build/secondary/third_party/android_tools/BUILD.gn ('k') | chrome/android/chrome_apk.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/android/BUILD.gn
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
index 4cbd447a61bc1339435eab997e14be105e2a7e9f..fddca79aecf7bcb44e2c99558c2fdefe168a97ea 100644
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -142,6 +142,7 @@ android_library("chrome_java") {
"//third_party/android_protobuf:protobuf_nano_javalib",
"//third_party/android_swipe_refresh:android_swipe_refresh_java",
"//third_party/android_tools:android_gcm_java",
+ "//third_party/android_tools:android_support_customtabs_java",
"//third_party/android_tools:android_support_design_java",
"//third_party/android_tools:android_support_v13_java",
"//third_party/android_tools:android_support_v7_appcompat_java",
@@ -166,7 +167,6 @@ android_library("chrome_java") {
srcjar_deps = [
":chrome_android_java_enums_srcjar",
":chrome_version_srcjar",
- ":custom_tabs_service_aidl",
":resource_id_javagen",
"//chrome:page_info_connection_type_javagen",
"//chrome:content_setting_javagen",
@@ -591,16 +591,6 @@ zip("chrome_version_srcjar") {
]
}
-#GYP: //chrome/android/chrome_apk.gyp:custom_tabs_service_aidl
-android_aidl("custom_tabs_service_aidl") {
- import_include = "java/src/android/support/customtabs"
- interface_file = "java/src/android/support/customtabs/common.aidl"
- sources = [
- "java/src/android/support/customtabs/ICustomTabsCallback.aidl",
- "java/src/android/support/customtabs/ICustomTabsService.aidl",
- ]
-}
-
# GYP: //chrome/android/chrome_apk.gyp:chrome_shared_test_java
android_library("chrome_shared_test_java") {
testonly = true
« no previous file with comments | « build/secondary/third_party/android_tools/BUILD.gn ('k') | chrome/android/chrome_apk.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698