Commit 3147e2a5 authored by Ella Ge's avatar Ella Ge Committed by Commit Bot

Update AndroidX.Browser dependency

To include extraCommand and ITrustedWebActivityCallback for location
delegation.

Bug: 1069506
Change-Id: I333a652db193167606360c7d4da7482e904b5f66
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2130771Reviewed-by: default avatarPeter Conn <peconn@chromium.org>
Reviewed-by: default avatarRobert Sesek <rsesek@chromium.org>
Commit-Queue: Ella Ge <eirage@chromium.org>
Cr-Commit-Position: refs/heads/master@{#760539}
parent 6137a19b
...@@ -713,7 +713,7 @@ deps = { ...@@ -713,7 +713,7 @@ deps = {
}, },
'src/third_party/android_sdk/androidx_browser/src': { 'src/third_party/android_sdk/androidx_browser/src': {
'url': Var('chromium_git') + '/external/gob/android/platform/frameworks/support/browser.git' + '@' + '8d0dd1606d54f678b94328a855a21baa9b99f682', 'url': Var('chromium_git') + '/external/gob/android/platform/frameworks/support/browser.git' + '@' + 'd05290c8d9d8630ced1e4472e73d47751f23ada9',
'condition': 'checkout_android', 'condition': 'checkout_android',
}, },
......
...@@ -7,36 +7,38 @@ import("//build/config/android/rules.gni") ...@@ -7,36 +7,38 @@ import("//build/config/android/rules.gni")
android_library("androidx_browser_java") { android_library("androidx_browser_java") {
skip_jetify = true skip_jetify = true
sources = [ sources = [
"./src/browser/src/main/java/androidx/browser/customtabs/CustomTabColorSchemeParams.java", "./src/browser/browser/src/main/java/androidx/browser/customtabs/CustomTabColorSchemeParams.java",
"./src/browser/src/main/java/androidx/browser/customtabs/CustomTabsCallback.java", "./src/browser/browser/src/main/java/androidx/browser/customtabs/CustomTabsCallback.java",
"./src/browser/src/main/java/androidx/browser/customtabs/CustomTabsClient.java", "./src/browser/browser/src/main/java/androidx/browser/customtabs/CustomTabsClient.java",
"./src/browser/src/main/java/androidx/browser/customtabs/CustomTabsIntent.java", "./src/browser/browser/src/main/java/androidx/browser/customtabs/CustomTabsIntent.java",
"./src/browser/src/main/java/androidx/browser/customtabs/CustomTabsService.java", "./src/browser/browser/src/main/java/androidx/browser/customtabs/CustomTabsService.java",
"./src/browser/src/main/java/androidx/browser/customtabs/CustomTabsServiceConnection.java", "./src/browser/browser/src/main/java/androidx/browser/customtabs/CustomTabsServiceConnection.java",
"./src/browser/src/main/java/androidx/browser/customtabs/CustomTabsSession.java", "./src/browser/browser/src/main/java/androidx/browser/customtabs/CustomTabsSession.java",
"./src/browser/src/main/java/androidx/browser/customtabs/CustomTabsSessionToken.java", "./src/browser/browser/src/main/java/androidx/browser/customtabs/CustomTabsSessionToken.java",
"./src/browser/src/main/java/androidx/browser/customtabs/PostMessageBackend.java", "./src/browser/browser/src/main/java/androidx/browser/customtabs/PostMessageBackend.java",
"./src/browser/src/main/java/androidx/browser/customtabs/PostMessageService.java", "./src/browser/browser/src/main/java/androidx/browser/customtabs/PostMessageService.java",
"./src/browser/src/main/java/androidx/browser/customtabs/PostMessageServiceConnection.java", "./src/browser/browser/src/main/java/androidx/browser/customtabs/PostMessageServiceConnection.java",
"./src/browser/src/main/java/androidx/browser/customtabs/TrustedWebUtils.java", "./src/browser/browser/src/main/java/androidx/browser/customtabs/TrustedWebUtils.java",
"./src/browser/src/main/java/androidx/browser/trusted/ConnectionHolder.java", "./src/browser/browser/src/main/java/androidx/browser/trusted/ConnectionHolder.java",
"./src/browser/src/main/java/androidx/browser/trusted/FutureUtils.java", "./src/browser/browser/src/main/java/androidx/browser/trusted/FutureUtils.java",
"./src/browser/src/main/java/androidx/browser/trusted/NotificationApiHelperForM.java", "./src/browser/browser/src/main/java/androidx/browser/trusted/NotificationApiHelperForM.java",
"./src/browser/src/main/java/androidx/browser/trusted/NotificationApiHelperForO.java", "./src/browser/browser/src/main/java/androidx/browser/trusted/NotificationApiHelperForO.java",
"./src/browser/src/main/java/androidx/browser/trusted/PackageIdentityUtils.java", "./src/browser/browser/src/main/java/androidx/browser/trusted/PackageIdentityUtils.java",
"./src/browser/src/main/java/androidx/browser/trusted/Token.java", "./src/browser/browser/src/main/java/androidx/browser/trusted/Token.java",
"./src/browser/src/main/java/androidx/browser/trusted/TokenContents.java", "./src/browser/browser/src/main/java/androidx/browser/trusted/TokenContents.java",
"./src/browser/src/main/java/androidx/browser/trusted/TokenStore.java", "./src/browser/browser/src/main/java/androidx/browser/trusted/TokenStore.java",
"./src/browser/src/main/java/androidx/browser/trusted/TrustedWebActivityDisplayMode.java", "./src/browser/browser/src/main/java/androidx/browser/trusted/TrustedWebActivityCallback.java",
"./src/browser/src/main/java/androidx/browser/trusted/TrustedWebActivityIntent.java", "./src/browser/browser/src/main/java/androidx/browser/trusted/TrustedWebActivityCallbackRemote.java",
"./src/browser/src/main/java/androidx/browser/trusted/TrustedWebActivityIntentBuilder.java", "./src/browser/browser/src/main/java/androidx/browser/trusted/TrustedWebActivityDisplayMode.java",
"./src/browser/src/main/java/androidx/browser/trusted/TrustedWebActivityService.java", "./src/browser/browser/src/main/java/androidx/browser/trusted/TrustedWebActivityIntent.java",
"./src/browser/src/main/java/androidx/browser/trusted/TrustedWebActivityServiceConnection.java", "./src/browser/browser/src/main/java/androidx/browser/trusted/TrustedWebActivityIntentBuilder.java",
"./src/browser/src/main/java/androidx/browser/trusted/TrustedWebActivityServiceConnectionPool.java", "./src/browser/browser/src/main/java/androidx/browser/trusted/TrustedWebActivityService.java",
"./src/browser/src/main/java/androidx/browser/trusted/sharing/ShareData.java", "./src/browser/browser/src/main/java/androidx/browser/trusted/TrustedWebActivityServiceConnection.java",
"./src/browser/src/main/java/androidx/browser/trusted/sharing/ShareTarget.java", "./src/browser/browser/src/main/java/androidx/browser/trusted/TrustedWebActivityServiceConnectionPool.java",
"./src/browser/src/main/java/androidx/browser/trusted/splashscreens/SplashScreenParamKey.java", "./src/browser/browser/src/main/java/androidx/browser/trusted/sharing/ShareData.java",
"./src/browser/src/main/java/androidx/browser/trusted/splashscreens/SplashScreenVersion.java", "./src/browser/browser/src/main/java/androidx/browser/trusted/sharing/ShareTarget.java",
"./src/browser/browser/src/main/java/androidx/browser/trusted/splashscreens/SplashScreenParamKey.java",
"./src/browser/browser/src/main/java/androidx/browser/trusted/splashscreens/SplashScreenVersion.java",
] ]
deps = [ deps = [
"//third_party/android_deps:android_support_v7_appcompat_java", "//third_party/android_deps:android_support_v7_appcompat_java",
...@@ -51,7 +53,7 @@ android_library("androidx_browser_java") { ...@@ -51,7 +53,7 @@ android_library("androidx_browser_java") {
"//third_party/android_deps:com_android_support_support_compat_java_orig", "//third_party/android_deps:com_android_support_support_compat_java_orig",
] ]
srcjar_deps = [ ":androidx_browser_service_aidl" ] srcjar_deps = [ ":androidx_browser_service_aidl" ]
android_manifest_for_lint = "src/browser/src/main/AndroidManifest.xml" android_manifest_for_lint = "src/browser/browser/src/main/AndroidManifest.xml"
chromium_code = false chromium_code = false
} }
...@@ -59,9 +61,10 @@ android_aidl("androidx_browser_service_aidl") { ...@@ -59,9 +61,10 @@ android_aidl("androidx_browser_service_aidl") {
interface_file = "common.aidl" interface_file = "common.aidl"
sources = [ sources = [
"./src/browser/src/main/aidl/android/support/customtabs/ICustomTabsCallback.aidl", "./src/browser/browser/src/main/aidl/android/support/customtabs/ICustomTabsCallback.aidl",
"./src/browser/src/main/aidl/android/support/customtabs/ICustomTabsService.aidl", "./src/browser/browser/src/main/aidl/android/support/customtabs/ICustomTabsService.aidl",
"./src/browser/src/main/aidl/android/support/customtabs/IPostMessageService.aidl", "./src/browser/browser/src/main/aidl/android/support/customtabs/IPostMessageService.aidl",
"./src/browser/src/main/aidl/android/support/customtabs/trusted/ITrustedWebActivityService.aidl", "./src/browser/browser/src/main/aidl/android/support/customtabs/trusted/ITrustedWebActivityCallback.aidl",
"./src/browser/browser/src/main/aidl/android/support/customtabs/trusted/ITrustedWebActivityService.aidl",
] ]
} }
Name: AndroidX Browser Name: AndroidX Browser
Short Name: AndroidX Browser Short Name: AndroidX Browser
URL: https://chromium.googlesource.com/external/gob/android/platform/frameworks/support/browser URL: https://chromium.googlesource.com/external/gob/android/platform/frameworks/support/browser
Version: 8d0dd1606d54f678b94328a855a21baa9b99f682 Version: f6689889c56295d1e97d3597bb44c9901b8f282b
License: Apache 2.0 License: Apache 2.0
Security Critical: yes Security Critical: yes
License Android Compatible: yes License Android Compatible: yes
......
...@@ -5,4 +5,5 @@ ...@@ -5,4 +5,5 @@
interface android.support.customtabs.ICustomTabsService; interface android.support.customtabs.ICustomTabsService;
interface android.support.customtabs.ICustomTabsCallback; interface android.support.customtabs.ICustomTabsCallback;
interface android.support.customtabs.IPostMessageService; interface android.support.customtabs.IPostMessageService;
interface android.support.customtabs.trusted.ITrustedWebActivityCallback;
interface android.support.customtabs.trusted.ITrustedWebActivityService; interface android.support.customtabs.trusted.ITrustedWebActivityService;
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment