Merge "Explain why there are two licenses in here." am: 7ea5aa9624 am: 7809db48d8android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-3android-s-v2-beta-2android-s-qpr3-beta-1android-t-preview-1android-s-v2-preview-1android-s-v2-beta-3android-s-qpr3-beta-1

Original change: https://android-review.googlesource.com/c/platform/external/zopfli/+/1736675

Change-Id: I1e2b7e9a1a8a103e87a004dfbc868cf7bfaf4108

1 files changed, 2 insertions, 19 deletions

diff --git a/Android.bp b/Android.bp
index 9db5ece..8a1c818 100644
--- a/Android.bp
+++ b/Android.bp
@@ -2,30 +2,13 @@ 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: [
+        // Most of the code is APL2...
         "SPDX-license-identifier-Apache-2.0",
+        // ...but src/zopflipng/lodepng is zlib instead.
         "SPDX-license-identifier-Zlib",
     ],
     license_text: [