Commit 365ee40e authored by Ella Ge's avatar Ella Ge Committed by Commit Bot

Reland "Update AndroidX.Browser dependency"

This reverts commit 0ea86868.

Reason for revert: reland with fix

Original change's description:
> Revert "Update AndroidX.Browser dependency"
> 
> This reverts commit 28b4bf48.
> 
> Reason for revert: Compile failure on https://ci.chromium.org/p/chromium/builders/ci/android-archive-rel/12150?
> 
> Original change's description:
> > 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: Peter Conn <peconn@chromium.org>
> > Cr-Commit-Position: refs/heads/master@{#775573}
> 
> TBR=peconn@chromium.org,eirage@chromium.org
> 
> Change-Id: Ib0c067f24efe4def48a42e47656bcae759206dc1
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: 1069506
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2231823
> Reviewed-by: Yi Gu <yigu@chromium.org>
> Commit-Queue: Yi Gu <yigu@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#775585}

TBR=peconn@chromium.org,yigu@chromium.org,eirage@chromium.org

# Not skipping CQ checks because this is a reland.

Bug: 1069506
Change-Id: Ia8d51c97613028798db4c192979f17afee837fb3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2232740Reviewed-by: default avatarElla Ge <eirage@chromium.org>
Commit-Queue: Ella Ge <eirage@chromium.org>
Cr-Commit-Position: refs/heads/master@{#775702}
parent bee58d0f
......@@ -720,7 +720,7 @@ deps = {
},
'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',
},
......
......@@ -675,20 +675,6 @@
-keep public class androidx.**Parcelizer { *; }
-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
################################################################################
......
......@@ -172,7 +172,7 @@ public class TrustedWebActivityClient {
}
};
Bundle executionResult = service.extraCommand(
Bundle executionResult = service.sendExtraCommand(
CHECK_LOCATION_PERMISSION_COMMAND_NAME, Bundle.EMPTY, resultCallback);
// Set permission to false if the service does not know how to handle the
// extraCommand.
......
......@@ -4,8 +4,7 @@
package org.chromium.customtabsclient;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;
import androidx.browser.customtabs.CustomTabsSession;
import java.lang.ref.WeakReference;
......
......@@ -40,12 +40,10 @@ android_library("androidx_browser_java") {
"./src/browser/browser/src/main/java/androidx/browser/trusted/splashscreens/SplashScreenVersion.java",
]
deps = [
"//third_party/android_deps:android_support_v7_appcompat_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:com_android_support_collections_java",
"//third_party/android_deps:com_android_support_support_annotations_java",
"//third_party/android_deps:com_android_support_support_compat_java",
"//third_party/android_deps:androidx_core_core_java",
]
srcjar_deps = [ ":androidx_browser_service_aidl" ]
chromium_code = false
......
Name: AndroidX Browser
Short Name: AndroidX Browser
URL: https://chromium.googlesource.com/external/gob/android/platform/frameworks/support/browser
Version: f6689889c56295d1e97d3597bb44c9901b8f282b
Version: ac2f9c348999e8943567c6e4d50a82a5010ca263
License: Apache 2.0
Security Critical: 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