diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-07-14 00:43:51 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-07-14 00:43:51 +0000 |
commit | 6345f3b6f130e5b84b950dff93dcbb3af5adc026 (patch) | |
tree | 589760d24e3dd51884de9ff3c90476f7653a6853 | |
parent | 6f6faff0bfab0b88624eac2ef82bc794c3706b6e (diff) | |
parent | 5508c84e2e04c0035ad85c04b81eeaf95f0bfd5f (diff) | |
download | chromium-webview-android12-mainline-permission-release.tar.gz |
Snap for 7547121 from 5508c84e2e04c0035ad85c04b81eeaf95f0bfd5f to mainline-permission-releaseandroid-mainline-12.0.0_r93android-mainline-12.0.0_r79android-mainline-12.0.0_r64android-mainline-12.0.0_r51android-mainline-12.0.0_r34android-mainline-12.0.0_r15android-mainline-12.0.0_r123android-mainline-12.0.0_r107android12-mainline-permission-release
Change-Id: I36b1eaae5f0874b30d4ca04c27c456b376a7a97a
-rw-r--r-- | Android.bp | 55 | ||||
-rw-r--r-- | Android.mk | 36 | ||||
-rw-r--r-- | METADATA | 3 | ||||
-rw-r--r-- | TEST_MAPPING | 20 | ||||
-rw-r--r-- | prebuilt/arm/webview.apk | bin | 39052393 -> 48672557 bytes | |||
-rw-r--r-- | prebuilt/arm64/webview.apk | bin | 69948859 -> 85274749 bytes | |||
-rw-r--r-- | prebuilt/x86/webview.apk | bin | 44364882 -> 55570118 bytes | |||
-rw-r--r-- | prebuilt/x86_64/webview.apk | bin | 76227995 -> 92237839 bytes |
8 files changed, 78 insertions, 36 deletions
diff --git a/Android.bp b/Android.bp new file mode 100644 index 0000000..2114d08 --- /dev/null +++ b/Android.bp @@ -0,0 +1,55 @@ +// +// 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 deleted file mode 100644 index cad13c6..0000000 --- a/Android.mk +++ /dev/null @@ -1,36 +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. - -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 new file mode 100644 index 0000000..d97975c --- /dev/null +++ b/METADATA @@ -0,0 +1,3 @@ +third_party { + license_type: NOTICE +} 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 Binary files differindex d8f420c..fc22b82 100644 --- a/prebuilt/arm/webview.apk +++ b/prebuilt/arm/webview.apk diff --git a/prebuilt/arm64/webview.apk b/prebuilt/arm64/webview.apk Binary files differindex 25fb667..ea00b23 100644 --- a/prebuilt/arm64/webview.apk +++ b/prebuilt/arm64/webview.apk diff --git a/prebuilt/x86/webview.apk b/prebuilt/x86/webview.apk Binary files differindex c068c1e..960132b 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 Binary files differindex 324f071..6df66d4 100644 --- a/prebuilt/x86_64/webview.apk +++ b/prebuilt/x86_64/webview.apk |