diff options
| -rw-r--r-- | Android.bp | 30 | ||||
| -rw-r--r-- | METADATA | 3 |
2 files changed, 12 insertions, 21 deletions
@@ -18,33 +18,25 @@ // CONSULT THE OWNERS AND opensource-licensing@google.com BEFORE // DEPENDING ON IT IN YOUR PROJECT. *** package { - default_applicable_licenses: ["tools_apkzlib_license"], + // See: http://go/android-license-faq + default_applicable_licenses: ["Android-Apache-2.0"], } -// 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__"], + name: "tools_apkzlib_testdata_license", + visibility: ["//visibility:private"], 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 +} + +filegroup { + name: "tools_apkzlib_testdata", + srcs: ["src/test/resources/testData/**/*"], + visibility: ["//visibility:private"], + licenses: ["tools_apkzlib_testdata_license"], } java_library_static { @@ -2,7 +2,6 @@ # 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_note: "would be NOTICE save for GFDL in: src/test/resources/testData/packaging/text-files/wikipedia.html" license_type: BY_EXCEPTION_ONLY } |