Commit 28b4bf48 authored by Ella Ge's avatar Ella Ge Committed by Commit Bot

Update AndroidX.Browser dependency


Bug: 1069506
Change-Id: I6e6fd53dcb6d8bae3022c1d5d4c5834723156ba0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2230159
Commit-Queue: Ella Ge <eirage@chromium.org>
Reviewed-by: default avatarPeter Conn <peconn@chromium.org>
Cr-Commit-Position: refs/heads/master@{#775573}
parent 238648b5
...@@ -720,7 +720,7 @@ deps = { ...@@ -720,7 +720,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' + '@' + 'd05290c8d9d8630ced1e4472e73d47751f23ada9', 'url': Var('chromium_git') + '/external/gob/android/platform/frameworks/support/browser.git' + '@' + 'ac2f9c348999e8943567c6e4d50a82a5010ca263',
'condition': 'checkout_android', 'condition': 'checkout_android',
}, },
......
...@@ -675,20 +675,6 @@ ...@@ -675,20 +675,6 @@
-keep public class androidx.**Parcelizer { *; } -keep public class androidx.**Parcelizer { *; }
-keep public class androidx.versionedparcelable.ParcelImpl -keep public class androidx.versionedparcelable.ParcelImpl
################################################################################
# obj/third_party/android_deps/com_android_support_support_compat_java/proguard.txt
################################################################################
# aapt2 is not (yet) keeping FQCNs defined in the appComponentFactory <application> attribute
-keep class android.support.v4.app.CoreComponentFactory
################################################################################
# obj/third_party/android_deps/com_android_support_versionedparcelable_java/proguard.txt
################################################################################
-keep public class * extends androidx.versionedparcelable.VersionedParcelable
-keep public class android.support.**Parcelizer { *; }
-keep public class androidx.**Parcelizer { *; }
-keep public class androidx.versionedparcelable.ParcelImpl
################################################################################ ################################################################################
# obj/third_party/android_deps/google_play_services_base_java/proguard.txt # obj/third_party/android_deps/google_play_services_base_java/proguard.txt
################################################################################ ################################################################################
......
...@@ -172,7 +172,7 @@ public class TrustedWebActivityClient { ...@@ -172,7 +172,7 @@ public class TrustedWebActivityClient {
} }
}; };
Bundle executionResult = service.extraCommand( Bundle executionResult = service.sendExtraCommand(
CHECK_LOCATION_PERMISSION_COMMAND_NAME, Bundle.EMPTY, resultCallback); CHECK_LOCATION_PERMISSION_COMMAND_NAME, Bundle.EMPTY, resultCallback);
// Set permission to false if the service does not know how to handle the // Set permission to false if the service does not know how to handle the
// extraCommand. // extraCommand.
......
...@@ -40,12 +40,10 @@ android_library("androidx_browser_java") { ...@@ -40,12 +40,10 @@ android_library("androidx_browser_java") {
"./src/browser/browser/src/main/java/androidx/browser/trusted/splashscreens/SplashScreenVersion.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:androidx_annotation_annotation_java", "//third_party/android_deps:androidx_annotation_annotation_java",
"//third_party/android_deps:androidx_collection_collection_java",
"//third_party/android_deps:androidx_concurrent_concurrent_futures_java", "//third_party/android_deps:androidx_concurrent_concurrent_futures_java",
"//third_party/android_deps:com_android_support_collections_java", "//third_party/android_deps:androidx_core_core_java",
"//third_party/android_deps:com_android_support_support_annotations_java",
"//third_party/android_deps:com_android_support_support_compat_java",
] ]
srcjar_deps = [ ":androidx_browser_service_aidl" ] srcjar_deps = [ ":androidx_browser_service_aidl" ]
chromium_code = false chromium_code = false
......
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: f6689889c56295d1e97d3597bb44c9901b8f282b Version: ac2f9c348999e8943567c6e4d50a82a5010ca263
License: Apache 2.0 License: Apache 2.0
Security Critical: yes Security Critical: yes
License Android Compatible: yes License Android Compatible: yes
......
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