Snap for 7478067 from 827c8268312a9acd0d7156c5573f6473802a3480 to mainline-extservices-release
Change-Id: Idcdaf4d51ef64a2afe2c5cea196711df379d0122
diff --git a/Android.bp b/Android.bp
index d1e8bfb..ef6507d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -14,6 +14,39 @@
// limitations under the License.
//
+// *** THIS PACKAGE HAS SPECIAL LICENSING CONDITIONS. PLEASE
+// CONSULT THE OWNERS AND opensource-licensing@google.com BEFORE
+// DEPENDING ON IT IN YOUR PROJECT. ***
+package {
+ 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_license",
+ visibility: [":__subpackages__"],
+ license_kinds: [
+ "SPDX-license-identifier-Apache-2.0",
+ "SPDX-license-identifier-GFDL", // by exception only
+ "SPDX-license-identifier-GPL",
+ "legacy_notice",
+ ],
+ // large-scale-change unable to identify any license_text files
+}
+
java_library_static {
name: "apkzlib_zip",
sdk_version: "24",
diff --git a/METADATA b/METADATA
new file mode 100644
index 0000000..2426d81
--- /dev/null
+++ b/METADATA
@@ -0,0 +1,8 @@
+# *** THIS PACKAGE HAS SPECIAL LICENSING CONDITIONS. PLEASE
+# CONSULT THE OWNERS AND opensource-licensing@google.com BEFORE
+# DEPENDING ON IT IN YOUR PROJECT. ***
+third_party {
+ # would be NOTICE save for GFDL in:
+ # src/test/resources/testData/packaging/text-files/wikipedia.html
+ license_type: BY_EXCEPTION_ONLY
+}
diff --git a/OWNERS b/OWNERS
index a894355..2cbc263 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,2 +1 @@
cmw@google.com
-kudasov@google.com
diff --git a/src/main/java/com/android/tools/build/apkzlib/zip/Eocd.java b/src/main/java/com/android/tools/build/apkzlib/zip/Eocd.java
index a9da14b..d045b9b 100644
--- a/src/main/java/com/android/tools/build/apkzlib/zip/Eocd.java
+++ b/src/main/java/com/android/tools/build/apkzlib/zip/Eocd.java
@@ -136,7 +136,7 @@
int commentSize = Ints.checkedCast(F_COMMENT_SIZE.read(bytes));
/*
- * Some sanity checks.
+ * Some quick checks.
*/
if (totalRecords1 != totalRecords2) {
throw new IOException("Zip states records split in multiple disks, which is not "