diff options
| author | Elliott Hughes <enh@google.com> | 2021-06-15 00:41:49 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-06-15 00:41:49 +0000 |
| commit | 0ba865af92b306705feea4a6d6f6b02c82902ad1 (patch) | |
| tree | 98933f57c4237c271d8bc355891a1bdbcbb3a25b | |
| parent | a361033957ea96c3cff2e571c49c234903629548 (diff) | |
| parent | 2999cd7058e3a1fd596e9f00b17d35eebcd46879 (diff) | |
| download | zopfli-0ba865af92b306705feea4a6d6f6b02c82902ad1.tar.gz | |
Merge "Explain why there are two licenses in here." am: 7ea5aa9624 am: 7809db48d8 am: 2999cd7058
Original change: https://android-review.googlesource.com/c/platform/external/zopfli/+/1736675
Change-Id: Ic61d9cc2395f0b3fbfd836d9b5fdf7d2a4a5c514
| -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: [ |