diff options
author | Bob Badour <bbadour@google.com> | 2021-02-17 18:48:53 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-17 18:48:53 +0000 |
commit | 96a83bb89ccdfdc60d3d9d9bc6758159f705dce9 (patch) | |
tree | 47902e4eead5257fdedb3c3d6f68148f26a556a4 | |
parent | 1b09a3d006f1ca3470d0c50b58c494523a489a88 (diff) | |
parent | 8612147955eb91cb7a3e6d77e279c1d50fbd6a40 (diff) | |
download | iproute2-96a83bb89ccdfdc60d3d9d9bc6758159f705dce9.tar.gz |
Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/iproute2" am: 1799e9ce3b am: 8612147955
Original change: https://android-review.googlesource.com/c/platform/external/iproute2/+/1588873
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5afbbec4520c5cb8ecdc2cdbd84c40a5512bcf36
-rw-r--r-- | Android.bp | 40 | ||||
-rw-r--r-- | ip/Android.bp | 32 | ||||
-rw-r--r-- | lib/Android.bp | 31 | ||||
-rw-r--r-- | misc/Android.bp | 10 | ||||
-rw-r--r-- | tc/Android.bp | 33 |
5 files changed, 146 insertions, 0 deletions
@@ -1,3 +1,43 @@ +package { + default_applicable_licenses: ["external_iproute2_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:'. +// See: http://go/android-license-faq +license { + name: "external_iproute2_license", + visibility: [":__subpackages__"], + license_kinds: [ + "SPDX-license-identifier-BSD", + "SPDX-license-identifier-GPL", + "SPDX-license-identifier-GPL-2.0", + "SPDX-license-identifier-GPL-3.0", + "SPDX-license-identifier-LGPL", + "legacy_unencumbered", + ], + license_text: [ + "COPYING", + "NOTICE", + ], +} + NETNS_RUN_DIR = "/mnt/run" cc_library_headers { diff --git a/ip/Android.bp b/ip/Android.bp index a6e533eb..d15739eb 100644 --- a/ip/Android.bp +++ b/ip/Android.bp @@ -1,3 +1,35 @@ +package { + default_applicable_licenses: ["external_iproute2_ip_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_iproute2_ip_license", + visibility: [":__subpackages__"], + license_kinds: [ + "SPDX-license-identifier-GPL", + "SPDX-license-identifier-GPL-2.0", + "SPDX-license-identifier-LGPL", + "legacy_unencumbered", + ], + license_text: [ + "NOTICE", + ], +} + cc_binary { name: "ip", defaults: ["iproute2_defaults"], diff --git a/lib/Android.bp b/lib/Android.bp index 7b9f59ca..cb91127a 100644 --- a/lib/Android.bp +++ b/lib/Android.bp @@ -1,3 +1,34 @@ +package { + default_applicable_licenses: ["external_iproute2_lib_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_iproute2_lib_license", + visibility: [":__subpackages__"], + license_kinds: [ + "SPDX-license-identifier-GPL", + "SPDX-license-identifier-GPL-2.0", + "SPDX-license-identifier-LGPL", + ], + license_text: [ + "NOTICE", + ], +} + cc_library_shared { name: "libiprouteutil", defaults: ["iproute2_defaults"], diff --git a/misc/Android.bp b/misc/Android.bp index 8e86e728..05376189 100644 --- a/misc/Android.bp +++ b/misc/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_iproute2_license" + // to get the below license kinds: + // SPDX-license-identifier-GPL + // SPDX-license-identifier-GPL-2.0 + default_applicable_licenses: ["external_iproute2_license"], +} + cc_binary { name: "ss", defaults: ["iproute2_defaults"], diff --git a/tc/Android.bp b/tc/Android.bp index b2f6a1f8..866a40e2 100644 --- a/tc/Android.bp +++ b/tc/Android.bp @@ -1,3 +1,36 @@ +package { + default_applicable_licenses: ["external_iproute2_tc_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_iproute2_tc_license", + visibility: [":__subpackages__"], + license_kinds: [ + "SPDX-license-identifier-BSD", + "SPDX-license-identifier-GPL", + "SPDX-license-identifier-GPL-2.0", + "SPDX-license-identifier-GPL-3.0", + "SPDX-license-identifier-LGPL", + ], + license_text: [ + "NOTICE", + ], +} + cc_binary { name: "tc", defaults: ["iproute2_defaults"], |