aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Badour <bbadour@google.com>2021-02-17 18:48:52 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-02-17 18:48:52 +0000
commit6af95f3631b278db87719bd282b5dff9217b9eb0 (patch)
treef4a35f0dc12f653536d6ce305cd1a855cc337e96
parent5ed935fb1aa55efb25e9ea4761331486ab68a556 (diff)
parentad91f45aafba213cb51f40f09326fb5103a73ab0 (diff)
downloadiptables-6af95f3631b278db87719bd282b5dff9217b9eb0.tar.gz
Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/iptables" am: e09abae5c5 am: ad91f45aaf
Original change: https://android-review.googlesource.com/c/platform/external/iptables/+/1588826 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I52ca0d0d1026ebcfc9938e88ae21e266e8e66ea9
-rw-r--r--Android.bp34
-rw-r--r--extensions/Android.bp10
-rw-r--r--iptables/Android.bp13
-rw-r--r--libiptc/Android.bp9
-rw-r--r--libxtables/Android.bp10
5 files changed, 76 insertions, 0 deletions
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"],