|
|
@@ -19,8 +19,8 @@ Jira Ticket: https://prometheanworld.atlassian.net/browse/AP9-3128
|
|
|
chrome/android/java/src/org/chromium/chrome/browser/base/SplitMonochromeApplication.java | 24 ++++++++++++++++++++++++
|
|
|
chrome/android/java/src/org/chromium/chrome/browser/fullscreen/FullscreenHtmlApiHandler.java | 9 +++++++++
|
|
|
third_party/android_deps/buildSrc/src/main/groovy/BuildConfigGenerator.groovy | 15 +++++++++++++++
|
|
|
- third_party/r8/desugar_jdk_libs.json | 168 ---
|
|
|
- 7 files changed, 58 insertions(+), 168 deletion(-)
|
|
|
+ third_party/r8/desugar_jdk_libs.json | 164 ---
|
|
|
+ 7 files changed, 58 insertions(+), 164 deletion(-)
|
|
|
|
|
|
diff --git a/third_party/android_deps/build.gradle b/third_party/android_deps/build.gradle
|
|
|
--- a/third_party/android_deps/build.gradle
|
|
|
@@ -36,22 +36,22 @@ diff --git a/third_party/android_deps/build.gradle b/third_party/android_deps/bu
|
|
|
}
|
|
|
|
|
|
dependencyCheck {
|
|
|
-@@ -117,7 +119,10 @@
|
|
|
- compile 'com.google.guava:guava:30.1-android'
|
|
|
-
|
|
|
+@@ -115,7 +117,10 @@
|
|
|
// Needed by androidx.
|
|
|
- compile 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.3'
|
|
|
+ String kotlinxVersion = '1.5.0'
|
|
|
+ compile "org.jetbrains.kotlinx:kotlinx-coroutines-android:${kotlinxVersion}"
|
|
|
+ compile "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:${kotlinxVersion}"
|
|
|
+
|
|
|
|
|
|
+ // promethean telemetry
|
|
|
+ compile 'com.prometheanworld:telemetry:0.3.3'
|
|
|
+
|
|
|
- // buildCompile targets have supports_android = false.
|
|
|
- buildCompile 'com.google.guava:guava:30.1-jre'
|
|
|
+ // Upstream guava introduced versions with -android suffix starting with version
|
|
|
diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
|
|
|
--- a/chrome/android/java/AndroidManifest.xml
|
|
|
+++ b/chrome/android/java/AndroidManifest.xml
|
|
|
@@ -1284,6 +1284,10 @@ by a child template that "extends" this file.
|
|
|
- tools:ignore="ExportedContentProvider">
|
|
|
+ android:readPermission="android.permission.GLOBAL_SEARCH" />
|
|
|
</provider>
|
|
|
|
|
|
+ <meta-data
|
|
|
@@ -64,7 +64,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro
|
|
|
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
|
|
|
--- a/chrome/android/BUILD.gn
|
|
|
+++ b/chrome/android/BUILD.gn
|
|
|
-@@ -172,6 +172,7 @@ android_resources("chrome_base_module_resources") {
|
|
|
+@@ -180,6 +180,7 @@ android_resources("chrome_base_module_resources") {
|
|
|
"java/res_chromium_base/mipmap-xxxhdpi/app_icon.png",
|
|
|
"java/res_chromium_base/values/channel_constants.xml",
|
|
|
]
|
|
|
@@ -72,7 +72,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
|
|
|
}
|
|
|
|
|
|
android_resources("chrome_app_java_resources") {
|
|
|
-@@ -2455,6 +2456,7 @@ android_library("base_module_java") {
|
|
|
+@@ -2518,6 +2519,7 @@ android_library("base_module_java") {
|
|
|
"java/src/org/chromium/chrome/browser/tracing/TracingNotificationService.java",
|
|
|
]
|
|
|
deps = [
|
|
|
@@ -149,7 +149,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/fullscreen/Full
|
|
|
+import org.json.JSONObject;
|
|
|
|
|
|
import java.lang.ref.WeakReference;
|
|
|
-@@ -495,4 +498,10 @@
|
|
|
+@@ -500,4 +503,10 @@
|
|
|
mWebContentsInFullscreen = webContents;
|
|
|
mContentViewInFullscreen = contentView;
|
|
|
mTabInFullscreen = tab;
|
|
|
@@ -163,7 +163,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/fullscreen/Full
|
|
|
diff --git a/third_party/android_deps/buildSrc/src/main/groovy/BuildConfigGenerator.groovy b/third_party/android_deps/buildSrc/src/main/groovy/BuildConfigGenerator.groovy
|
|
|
--- a/third_party/android_deps/buildSrc/src/main/groovy/BuildConfigGenerator.groovy
|
|
|
+++ b/third_party/android_deps/buildSrc/src/main/groovy/BuildConfigGenerator.groovy
|
|
|
-@@ -864,6 +864,21 @@ class BuildConfigGenerator extends DefaultTask {
|
|
|
+@@ -890,6 +890,21 @@ class BuildConfigGenerator extends DefaultTask {
|
|
|
sb.append(' # this for other purposes, change buildCompileNoDeps in build.gradle.\n')
|
|
|
sb.append(' visibility = [ "//build/android/unused_resources:*" ]\n')
|
|
|
break
|
|
|
@@ -251,7 +251,7 @@ diff --git a/third_party/r8/desugar_jdk_libs.json b/third_party/r8/desugar_jdk_l
|
|
|
]
|
|
|
}
|
|
|
],
|
|
|
-@@ -73,82 +22,25 @@
|
|
|
+@@ -73,81 +22,25 @@
|
|
|
{
|
|
|
"api_level_below_or_equal": 25,
|
|
|
"rewrite_prefix": {
|
|
|
@@ -300,7 +300,6 @@ diff --git a/third_party/r8/desugar_jdk_libs.json b/third_party/r8/desugar_jdk_l
|
|
|
- "java.util.StringJoiner": "j$.util.StringJoiner",
|
|
|
- "java.util.Tripwire": "j$.util.Tripwire",
|
|
|
- "java.util.concurrent.DesugarUnsafe": "j$.util.concurrent.DesugarUnsafe",
|
|
|
-- "java.util.concurrent.ThreadLocalRandom": "j$.util.concurrent.ThreadLocalRandom",
|
|
|
- "java.util.concurrent.atomic.DesugarAtomic": "j$.util.concurrent.atomic.DesugarAtomic"
|
|
|
},
|
|
|
"retarget_lib_member": {
|
|
|
@@ -334,7 +333,7 @@ diff --git a/third_party/r8/desugar_jdk_libs.json b/third_party/r8/desugar_jdk_l
|
|
|
}
|
|
|
}
|
|
|
],
|
|
|
-@@ -156,83 +48,23 @@
|
|
|
+@@ -155,80 +48,23 @@
|
|
|
{
|
|
|
"api_level_below_or_equal": 25,
|
|
|
"rewrite_prefix": {
|
|
|
@@ -370,7 +369,6 @@ diff --git a/third_party/r8/desugar_jdk_libs.json b/third_party/r8/desugar_jdk_l
|
|
|
- "java.util.PrimitiveIterator": "j$.util.PrimitiveIterator",
|
|
|
- "java.util.Spliterator": "j$.util.Spliterator",
|
|
|
- "java.util.StringJoiner": "j$.util.StringJoiner",
|
|
|
-- "java.util.concurrent.ThreadLocalRandom": "j$.util.concurrent.ThreadLocalRandom",
|
|
|
- "java.util.concurrent.atomic.DesugarAtomic": "j$.util.concurrent.atomic.DesugarAtomic"
|
|
|
},
|
|
|
"retarget_lib_member": {
|
|
|
@@ -388,9 +386,7 @@ diff --git a/third_party/r8/desugar_jdk_libs.json b/third_party/r8/desugar_jdk_l
|
|
|
- "java.util.concurrent.atomic.AtomicReference#getAndUpdate": "java.util.concurrent.atomic.DesugarAtomicReference",
|
|
|
- "java.util.concurrent.atomic.AtomicReference#updateAndGet": "java.util.concurrent.atomic.DesugarAtomicReference",
|
|
|
- "java.util.concurrent.atomic.AtomicReference#getAndAccumulate": "java.util.concurrent.atomic.DesugarAtomicReference",
|
|
|
-- "java.util.concurrent.atomic.AtomicReference#accumulateAndGet": "java.util.concurrent.atomic.DesugarAtomicReference",
|
|
|
-- "java.util.Collections#synchronizedMap": "java.util.DesugarCollections",
|
|
|
-- "java.util.Collections#synchronizedSortedMap": "java.util.DesugarCollections"
|
|
|
+- "java.util.concurrent.atomic.AtomicReference#accumulateAndGet": "java.util.concurrent.atomic.DesugarAtomicReference"
|
|
|
},
|
|
|
"dont_rewrite": [
|
|
|
- "java.util.Iterator#remove"
|
Yifeng Wu