diff options
| author | Elliott Hughes <enh@google.com> | 2021-06-14 23:57:31 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-06-14 23:57:31 +0000 |
| commit | 7ea5aa962439e4073b1f8edd01f05295a4198038 (patch) | |
| tree | 98933f57c4237c271d8bc355891a1bdbcbb3a25b | |
| parent | a7aca0225b218bea25168000e960892e6cdc615c (diff) | |
| parent | eda3427d5d4526f69455293b3e76081a805aa98e (diff) | |
| download | zopfli-7ea5aa962439e4073b1f8edd01f05295a4198038.tar.gz | |
Merge "Explain why there are two licenses in here."
| -rw-r--r-- | Android.bp | 21 |
1 files changed, 2 insertions, 19 deletions
@@ -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: [ |