aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2021-08-14 06:31:13 +0000
committerXin Li <delphij@google.com>2021-08-14 06:31:13 +0000
commitbf92063c34437315a316431e03074821937c728f (patch)
tree589760d24e3dd51884de9ff3c90476f7653a6853
parent6bd0eb2316ec42fa13060db31bc75dcc14de241b (diff)
parent9a89493e7dcb2f1ac65258c88fdbad96d7ac3d1c (diff)
downloadchromium-webview-temp_sam_202323961.tar.gz
Merge sc-dev-plus-aosp-without-vendor@7634622temp_sam_202323961
Merged-In: I3e0b35f5a1b3d56a9b0a59d2e457c36bc909bef6 Change-Id: I7083ed5cfd0668b4673e4809eb804ac8556abda8
-rw-r--r--TEST_MAPPING20
-rw-r--r--prebuilt/arm/webview.apkbin39052393 -> 48672557 bytes
-rw-r--r--prebuilt/arm64/webview.apkbin69948859 -> 85274749 bytes
-rw-r--r--prebuilt/x86/webview.apkbin44364882 -> 55570118 bytes
-rw-r--r--prebuilt/x86_64/webview.apkbin76227995 -> 92237839 bytes
5 files changed, 20 insertions, 0 deletions
diff --git a/TEST_MAPPING b/TEST_MAPPING
new file mode 100644
index 0000000..e39cbc4
--- /dev/null
+++ b/TEST_MAPPING
@@ -0,0 +1,20 @@
+{
+ "presubmit": [
+ {
+ "name": "CtsWebkitTestCases",
+ "options": [
+ {
+ "exclude-annotation": "androidx.test.filters.FlakyTest"
+ }
+ ]
+ },
+ {
+ "name": "CtsHostsideWebViewTests",
+ "options": [
+ {
+ "exclude-annotation": "androidx.test.filters.FlakyTest"
+ }
+ ]
+ }
+ ]
+}
diff --git a/prebuilt/arm/webview.apk b/prebuilt/arm/webview.apk
index d8f420c..fc22b82 100644
--- a/prebuilt/arm/webview.apk
+++ b/prebuilt/arm/webview.apk
Binary files differ
diff --git a/prebuilt/arm64/webview.apk b/prebuilt/arm64/webview.apk
index 25fb667..ea00b23 100644
--- a/prebuilt/arm64/webview.apk
+++ b/prebuilt/arm64/webview.apk
Binary files differ
diff --git a/prebuilt/x86/webview.apk b/prebuilt/x86/webview.apk
index c068c1e..960132b 100644
--- a/prebuilt/x86/webview.apk
+++ b/prebuilt/x86/webview.apk
Binary files differ
diff --git a/prebuilt/x86_64/webview.apk b/prebuilt/x86_64/webview.apk
index 324f071..6df66d4 100644
--- a/prebuilt/x86_64/webview.apk
+++ b/prebuilt/x86_64/webview.apk
Binary files differ