Snap for 8426163 from edabab205c7dfab75cdcbc6846d1630728ba2482 to mainline-tzdata2-release
Change-Id: I9b27790b44dcdeeb0e781e325c71d561c05344a7
diff --git a/Android.bp b/Android.bp
index e4ed511..515d562 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,18 +1 @@
-package {
- default_applicable_licenses: ["external_libyuv_license"],
-}
-
-// Added automatically by a large-scale-change
-// See: http://go/android-license-faq
-license {
- name: "external_libyuv_license",
- visibility: [":__subpackages__"],
- license_kinds: [
- "SPDX-license-identifier-BSD",
- ],
- license_text: [
- "LICENSE",
- ],
-}
-
subdirs = ["files"]
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/files/Android.bp b/files/Android.bp
index c1aa8c6..6ef6e8d 100644
--- a/files/Android.bp
+++ b/files/Android.bp
@@ -1,31 +1,6 @@
-package {
- default_applicable_licenses: ["external_libyuv_files_license"],
-}
-
-// Added automatically by a large-scale-change
-//
-// large-scale-change included anything that looked like it might be a license
-// text as a license_text. e.g. LICENSE, NOTICE, COPYING etc.
-//
-// Please consider removing redundant or irrelevant files from 'license_text:'.
-// See: http://go/android-license-faq
-license {
- name: "external_libyuv_files_license",
- visibility: [":__subpackages__"],
- license_kinds: [
- "SPDX-license-identifier-BSD",
- ],
- license_text: [
- "LICENSE",
- "LICENSE_THIRD_PARTY",
- "PATENTS",
- ],
-}
-
cc_library {
name: "libyuv",
vendor_available: true,
- product_available: true,
host_supported: true,
vndk: {
enabled: true,
diff --git a/files/fuzz/Android.bp b/files/fuzz/Android.bp
index 0e49589..be3c78e 100644
--- a/files/fuzz/Android.bp
+++ b/files/fuzz/Android.bp
@@ -1,13 +1,4 @@
-package {
- // See: http://go/android-license-faq
- // A large-scale-change added 'default_applicable_licenses' to import
- // all of the 'license_kinds' from "external_libyuv_files_license"
- // to get the below license kinds:
- // SPDX-license-identifier-BSD
- default_applicable_licenses: ["external_libyuv_files_license"],
-}
-
cc_fuzz {
name: "libyuv_mjpeg_dec_fuzz",
host_supported: false,
