Snap for 8730993 from 827c8268312a9acd0d7156c5573f6473802a3480 to mainline-tzdata3-release
Change-Id: I472cf3e19eeeb6b49b1542f471f182bde99c13ba
diff --git a/Android.bp b/Android.bp
index 43f47e9..ef6507d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -18,25 +18,33 @@
// CONSULT THE OWNERS AND opensource-licensing@google.com BEFORE
// DEPENDING ON IT IN YOUR PROJECT. ***
package {
- // See: http://go/android-license-faq
- default_applicable_licenses: ["Android-Apache-2.0"],
+ default_applicable_licenses: ["tools_apkzlib_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.
+// See: http://go/android-license-faq
license {
- name: "tools_apkzlib_testdata_license",
- visibility: ["//visibility:private"],
+ name: "tools_apkzlib_license",
+ visibility: [":__subpackages__"],
license_kinds: [
+ "SPDX-license-identifier-Apache-2.0",
"SPDX-license-identifier-GFDL", // by exception only
"SPDX-license-identifier-GPL",
"legacy_notice",
],
-}
-
-filegroup {
- name: "tools_apkzlib_testdata",
- srcs: ["src/test/resources/testData/**/*"],
- visibility: ["//visibility:private"],
- licenses: ["tools_apkzlib_testdata_license"],
+ // large-scale-change unable to identify any license_text files
}
java_library_static {
diff --git a/METADATA b/METADATA
index 3066911..2426d81 100644
--- a/METADATA
+++ b/METADATA
@@ -2,6 +2,7 @@
# CONSULT THE OWNERS AND opensource-licensing@google.com BEFORE
# DEPENDING ON IT IN YOUR PROJECT. ***
third_party {
- license_note: "would be NOTICE save for GFDL in: src/test/resources/testData/packaging/text-files/wikipedia.html"
+ # would be NOTICE save for GFDL in:
+ # src/test/resources/testData/packaging/text-files/wikipedia.html
license_type: BY_EXCEPTION_ONLY
}
