From 45738d399df8036885e8673cb9bbde357fce1d7c Mon Sep 17 00:00:00 2001 From: Bob Badour Date: Fri, 12 Feb 2021 14:41:35 -0800 Subject: [LSC] Add LOCAL_LICENSE_KINDS to external/iptables Added SPDX-license-identifier-Artistic SPDX-license-identifier-Artistic-2.0 SPDX-license-identifier-GPL SPDX-license-identifier-GPL-2.0 SPDX-license-identifier-LGPL to: iptables/Android.bp Added SPDX-license-identifier-Artistic SPDX-license-identifier-Artistic-2.0 SPDX-license-identifier-GPL SPDX-license-identifier-GPL-2.0 SPDX-license-identifier-LGPL SPDX-license-identifier-MIT to: Android.bp Added SPDX-license-identifier-GPL to: libiptc/Android.bp Added SPDX-license-identifier-GPL SPDX-license-identifier-GPL-2.0 to: extensions/Android.bp Added SPDX-license-identifier-GPL-2.0 SPDX-license-identifier-LGPL to: libxtables/Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I457d29f9cf99f841712fa9d015859fbd7a51a5f9 --- Android.bp | 34 ++++++++++++++++++++++++++++++++++ extensions/Android.bp | 10 ++++++++++ iptables/Android.bp | 13 +++++++++++++ libiptc/Android.bp | 9 +++++++++ libxtables/Android.bp | 10 ++++++++++ 5 files changed, 76 insertions(+) diff --git a/Android.bp b/Android.bp index 3808573c..cec28515 100644 --- a/Android.bp +++ b/Android.bp @@ -1,3 +1,37 @@ +package { + default_applicable_licenses: ["external_iptables_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. +// See: http://go/android-license-faq +license { + name: "external_iptables_license", + visibility: [":__subpackages__"], + license_kinds: [ + "SPDX-license-identifier-Artistic", + "SPDX-license-identifier-Artistic-2.0", + "SPDX-license-identifier-GPL", + "SPDX-license-identifier-GPL-2.0", + "SPDX-license-identifier-LGPL", + "SPDX-license-identifier-MIT", + ], + license_text: [ + "COPYING", + ], +} + cc_library_headers { name: "iptables_headers", export_include_dirs: ["include"], diff --git a/extensions/Android.bp b/extensions/Android.bp index 6296db98..8a6b6e99 100644 --- a/extensions/Android.bp +++ b/extensions/Android.bp @@ -1,3 +1,13 @@ +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "external_iptables_license" + // to get the below license kinds: + // SPDX-license-identifier-GPL + // SPDX-license-identifier-GPL-2.0 + default_applicable_licenses: ["external_iptables_license"], +} + cc_defaults { name: "libext_defaults", defaults: ["iptables_defaults"], diff --git a/iptables/Android.bp b/iptables/Android.bp index 91bcb71f..22767029 100644 --- a/iptables/Android.bp +++ b/iptables/Android.bp @@ -1,3 +1,16 @@ +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "external_iptables_license" + // to get the below license kinds: + // SPDX-license-identifier-Artistic + // SPDX-license-identifier-Artistic-2.0 + // SPDX-license-identifier-GPL + // SPDX-license-identifier-GPL-2.0 + // SPDX-license-identifier-LGPL + default_applicable_licenses: ["external_iptables_license"], +} + cc_defaults { name: "iptables_cmd_defaults", defaults: ["iptables_defaults"], diff --git a/libiptc/Android.bp b/libiptc/Android.bp index 9f95909b..d7297a92 100644 --- a/libiptc/Android.bp +++ b/libiptc/Android.bp @@ -1,3 +1,12 @@ +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "external_iptables_license" + // to get the below license kinds: + // SPDX-license-identifier-GPL + default_applicable_licenses: ["external_iptables_license"], +} + cc_defaults { name: "libiptc_defaults", defaults: ["iptables_defaults"], diff --git a/libxtables/Android.bp b/libxtables/Android.bp index 41d61466..ed0cc44e 100644 --- a/libxtables/Android.bp +++ b/libxtables/Android.bp @@ -1,6 +1,16 @@ //---------------------------------------------------------------- // libxtables +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "external_iptables_license" + // to get the below license kinds: + // SPDX-license-identifier-GPL-2.0 + // SPDX-license-identifier-LGPL + default_applicable_licenses: ["external_iptables_license"], +} + cc_library_static { name: "libxtables", defaults: ["iptables_defaults"], -- cgit v1.2.3