From 4e6f02e95bc9adfff2626398441eefe5fd64e2a2 Mon Sep 17 00:00:00 2001 From: Bob Badour Date: Wed, 19 Jan 2022 17:11:43 -0800 Subject: Fix licenses. Restricted licenses confined to testdata not referenced by build. Test: m nothing Change-Id: Ie9ec786e6d22f939fdb4cb4fa3c9b0b3dec616f5 --- Android.bp | 30 +++++++++++------------------- 1 file changed, 11 insertions(+), 19 deletions(-) diff --git a/Android.bp b/Android.bp index ef6507d..43f47e9 100644 --- a/Android.bp +++ b/Android.bp @@ -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 { -- cgit v1.2.3 From 5cfc4620cd1b76da62d3fd7d8303c4a42809b10d Mon Sep 17 00:00:00 2001 From: Bob Badour Date: Thu, 3 Mar 2022 14:44:09 -0800 Subject: Move comment to license_note Comment not preserved during refresh. Test: m nothing Change-Id: I3bc4a1218245b0153136d12f64371f9a2e8a80d3 --- METADATA | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/METADATA b/METADATA index 2426d81..3066911 100644 --- a/METADATA +++ b/METADATA @@ -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 } -- cgit v1.2.3