Snap for 8426163 from 6f6faff0bfab0b88624eac2ef82bc794c3706b6e to mainline-tzdata2-releaseandroid-mainline-12.0.0_r112aml_tz2_305400500aml_tz2_305400300aml_tz2_305400100aml_tz2_304500300aml_tz2_303900110aml_tz2_303900102aml_tz2_303800002aml_tz2_303800001aml_tz2_303200001android12-mainline-tzdata2-releaseaml_tz2_305400100

Change-Id: I82e38fe3d3bc3a07f1f4e5829a74d89257b9b80c

8 files changed, 36 insertions, 78 deletions

diff --git a/Android.bp b/Android.bp
deleted file mode 100644
index 2114d08..0000000
--- a/Android.bp
+++ /dev/null
@@ -1,55 +0,0 @@
-//
-// Copyright (C) 2014 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-// Install the prebuilt webview apk.
-package {
-    default_applicable_licenses: ["external_chromium-webview_license"],
-}
-
-// Added automatically by a large-scale-change
-// See: http://go/android-license-faq
-license {
-    name: "external_chromium-webview_license",
-    visibility: [":__subpackages__"],
-    license_kinds: [
-        "SPDX-license-identifier-Unicode-DFS",
-    ],
-    // large-scale-change unable to identify any license_text files
-}
-
-android_app_import {
-    name: "webview",
-    product_specific: true,
-    default_dev_cert: true,
-    required: [
-        "libwebviewchromium_loader",
-        "libwebviewchromium_plat_support",
-    ],
-    arch: {
-        arm: {
-            apk: "prebuilt/arm//webview.apk",
-        },
-        arm64: {
-            apk: "prebuilt/arm64/webview.apk",
-        },
-        x86: {
-            apk: "prebuilt/x86/webview.apk",
-        },
-        x86_64: {
-            apk: "prebuilt/x86_64/webview.apk",
-        },
-    },
-}
diff --git a/Android.mk b/Android.mk
new file mode 100644
index 0000000..cad13c6
--- /dev/null
+++ b/Android.mk
@@ -0,0 +1,36 @@
+#
+# Copyright (C) 2014 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# Install the prebuilt webview apk.
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := webview
+LOCAL_MODULE_CLASS := APPS
+LOCAL_PRODUCT_MODULE := true
+LOCAL_MULTILIB := both
+LOCAL_CERTIFICATE := $(DEFAULT_SYSTEM_DEV_CERTIFICATE)
+LOCAL_REQUIRED_MODULES := \
+        libwebviewchromium_loader \
+        libwebviewchromium_plat_support
+
+LOCAL_MODULE_TARGET_ARCH := arm arm64 x86 x86_64
+my_src_arch := $(call get-prebuilt-src-arch,$(LOCAL_MODULE_TARGET_ARCH))
+LOCAL_SRC_FILES := prebuilt/$(my_src_arch)/webview.apk
+
+include $(BUILD_PREBUILT)
diff --git a/METADATA b/METADATA
deleted file mode 100644
index d97975c..0000000
--- a/METADATA
+++ /dev/null
@@ -1,3 +0,0 @@
-third_party {
-  license_type: NOTICE
-}
diff --git a/TEST_MAPPING b/TEST_MAPPING
deleted file mode 100644
index e39cbc4..0000000
--- a/TEST_MAPPING
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "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 fc22b82..d8f420c 100644
--- a/prebuilt/arm/webview.apk
+++ b/prebuilt/arm/webview.apk
diff --git a/prebuilt/arm64/webview.apk b/prebuilt/arm64/webview.apk
index ea00b23..25fb667 100644
--- a/prebuilt/arm64/webview.apk
+++ b/prebuilt/arm64/webview.apk
diff --git a/prebuilt/x86/webview.apk b/prebuilt/x86/webview.apk
index 960132b..c068c1e 100644
--- a/prebuilt/x86/webview.apk
+++ b/prebuilt/x86/webview.apk
diff --git a/prebuilt/x86_64/webview.apk b/prebuilt/x86_64/webview.apk
index 6df66d4..324f071 100644
--- a/prebuilt/x86_64/webview.apk
+++ b/prebuilt/x86_64/webview.apk