diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-12 14:27:29 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 09:35:20 +0000 |
| commit | c30a6232df03e1efbd9f3b226777b07e087a1122 (patch) | |
| tree | e992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/third_party/android_sdk | |
| parent | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff) | |
| download | qtwebengine-chromium-85-based.tar.gz | |
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/third_party/android_sdk')
| -rw-r--r-- | chromium/third_party/android_sdk/BUILD.gn | 2 | ||||
| -rw-r--r-- | chromium/third_party/android_sdk/androidx_browser/BUILD.gn | 7 |
2 files changed, 2 insertions, 7 deletions
diff --git a/chromium/third_party/android_sdk/BUILD.gn b/chromium/third_party/android_sdk/BUILD.gn index 172f43fa6ca..efaba4e06fb 100644 --- a/chromium/third_party/android_sdk/BUILD.gn +++ b/chromium/third_party/android_sdk/BUILD.gn @@ -60,12 +60,10 @@ if (enable_java_templates) { } android_library("android_support_chromium_java") { - skip_jetify = true testonly = true sources = [ "//third_party/android_sdk/public/extras/chromium/support/src/org/chromium/android/support/PackageManagerWrapper.java" ] } android_java_prebuilt("android_gcm_java") { - skip_jetify = true jar_path = "//third_party/android_sdk/public/extras/google/gcm/gcm-client/dist/gcm.jar" } } diff --git a/chromium/third_party/android_sdk/androidx_browser/BUILD.gn b/chromium/third_party/android_sdk/androidx_browser/BUILD.gn index 9cffe56108b..de641365b1e 100644 --- a/chromium/third_party/android_sdk/androidx_browser/BUILD.gn +++ b/chromium/third_party/android_sdk/androidx_browser/BUILD.gn @@ -5,7 +5,6 @@ import("//build/config/android/rules.gni") android_library("androidx_browser_java") { - skip_jetify = true sources = [ "./src/browser/browser/src/main/java/androidx/browser/customtabs/CustomTabColorSchemeParams.java", "./src/browser/browser/src/main/java/androidx/browser/customtabs/CustomTabsCallback.java", @@ -41,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 |