Snap for 8426163 from 4e42ccafb7c571f502a23177bca2d3cfc209035c to mainline-tzdata2-release
Change-Id: Id373406a102bb0475c0afa68de2431c73cfa4aaf
diff --git a/Android.bp b/Android.bp
index 9db5ece..be5d1e7 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,39 +1,3 @@
-package {
- default_applicable_licenses: ["external_zopfli_license"],
-}
-
-// Added automatically by a large-scale-change that took the approach of
-// 'apply every license found to every target'. While this makes sure we respect
-// every license restriction, it may not be entirely correct.
-//
-// e.g. GPL in an MIT project might only apply to the contrib/ directory.
-//
-// Please consider splitting the single license below into multiple licenses,
-// taking care not to lose any license_kind information, and overriding the
-// default license using the 'licenses: [...]' property on targets as needed.
-//
-// For unused files, consider creating a 'filegroup' with "//visibility:private"
-// to attach the license to, and including a comment whether the files may be
-// used in the current project.
-//
-// 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:'.
-// http://go/android-license-faq
-license {
- name: "external_zopfli_license",
- visibility: [":__subpackages__"],
- license_kinds: [
- "SPDX-license-identifier-Apache-2.0",
- "SPDX-license-identifier-Zlib",
- ],
- license_text: [
- "COPYING",
- "NOTICE",
- ],
-}
-
cc_library {
name: "libzopfli",
host_supported: true,
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
-}
