diff options
author | Bob Badour <bbadour@google.com> | 2021-02-17 15:54:01 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-17 15:54:01 +0000 |
commit | 440f7332f7b07908143dc8c4bf406b19764110ae (patch) | |
tree | dae274975191b30069a820e1ddccf64f5ca424c9 | |
parent | bad19c32162a459d0b740b1f523f7bbfc6817ddb (diff) | |
parent | f7878ea6532069bf003a8dd4965e95c1d020dcb4 (diff) | |
download | generic-440f7332f7b07908143dc8c4bf406b19764110ae.tar.gz |
[LSC] Add LOCAL_LICENSE_KINDS to external/nos/host/generic am: f7878ea653
Original change: https://android-review.googlesource.com/c/platform/external/nos/host/generic/+/1588626
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I958ca6007b18f56dc6095d48301d54541afde88f
-rw-r--r-- | Android.bp | 30 | ||||
-rw-r--r-- | libnos/Android.bp | 9 | ||||
-rw-r--r-- | libnos/generator/Android.bp | 9 | ||||
-rw-r--r-- | libnos/generator/test/Android.bp | 9 | ||||
-rw-r--r-- | libnos/test/Android.bp | 9 | ||||
-rw-r--r-- | libnos_datagram/Android.bp | 19 | ||||
-rw-r--r-- | libnos_transport/Android.bp | 19 | ||||
-rw-r--r-- | nugget/proto/Android.bp | 10 | ||||
-rw-r--r-- | nugget/proto/nugget/app/avb/Android.bp | 9 | ||||
-rw-r--r-- | nugget/proto/nugget/app/identity/Android.bp | 9 | ||||
-rw-r--r-- | nugget/proto/nugget/app/keymaster/Android.bp | 9 | ||||
-rw-r--r-- | nugget/proto/nugget/app/weaver/Android.bp | 9 |
12 files changed, 150 insertions, 0 deletions
@@ -14,6 +14,36 @@ // limitations under the License. // +package { + default_applicable_licenses: ["external_nos_host_generic_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_nos_host_generic_license", + visibility: [":__subpackages__"], + license_kinds: [ + "SPDX-license-identifier-Apache-2.0", + "SPDX-license-identifier-BSD", + ], + license_text: [ + "LICENSE", + ], +} + cc_library_headers { name: "nos_headers", defaults: ["nos_cc_host_supported_defaults"], diff --git a/libnos/Android.bp b/libnos/Android.bp index 49c5385..f68df27 100644 --- a/libnos/Android.bp +++ b/libnos/Android.bp @@ -14,6 +14,15 @@ // limitations under the License. // +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "external_nos_host_generic_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["external_nos_host_generic_license"], +} + cc_library { name: "libnos", srcs: [ diff --git a/libnos/generator/Android.bp b/libnos/generator/Android.bp index 4ff1606..a7cc964 100644 --- a/libnos/generator/Android.bp +++ b/libnos/generator/Android.bp @@ -14,6 +14,15 @@ // limitations under the License. // +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "external_nos_host_generic_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["external_nos_host_generic_license"], +} + cc_binary_host { name: "protoc-gen-nos-client-cpp", srcs: ["main.cpp"], diff --git a/libnos/generator/test/Android.bp b/libnos/generator/test/Android.bp index d854692..30287aa 100644 --- a/libnos/generator/test/Android.bp +++ b/libnos/generator/test/Android.bp @@ -14,6 +14,15 @@ // limitations under the License. // +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "external_nos_host_generic_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["external_nos_host_generic_license"], +} + genrule { name: "nos_generator_test_service_genc++", out: ["Hello.client.cpp"], diff --git a/libnos/test/Android.bp b/libnos/test/Android.bp index 0a06894..526b9eb 100644 --- a/libnos/test/Android.bp +++ b/libnos/test/Android.bp @@ -14,6 +14,15 @@ // limitations under the License. // +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "external_nos_host_generic_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["external_nos_host_generic_license"], +} + cc_test_library { name: "libnos_mock", defaults: ["nos_cc_host_supported_defaults"], diff --git a/libnos_datagram/Android.bp b/libnos_datagram/Android.bp index 2a2b659..0176e00 100644 --- a/libnos_datagram/Android.bp +++ b/libnos_datagram/Android.bp @@ -14,6 +14,25 @@ // limitations under the License. // +package { + default_applicable_licenses: [ + "external_nos_host_generic_libnos_datagram_license", + ], +} + +// Added automatically by a large-scale-change +// See: http://go/android-license-faq +license { + name: "external_nos_host_generic_libnos_datagram_license", + visibility: [":__subpackages__"], + license_kinds: [ + "SPDX-license-identifier-Apache-2.0", + ], + license_text: [ + "NOTICE", + ], +} + cc_library { name: "libnos_datagram", defaults: ["nos_cc_host_supported_defaults"], diff --git a/libnos_transport/Android.bp b/libnos_transport/Android.bp index f9af019..1dd8992 100644 --- a/libnos_transport/Android.bp +++ b/libnos_transport/Android.bp @@ -14,6 +14,25 @@ // limitations under the License. // +package { + default_applicable_licenses: [ + "external_nos_host_generic_libnos_transport_license", + ], +} + +// Added automatically by a large-scale-change +// See: http://go/android-license-faq +license { + name: "external_nos_host_generic_libnos_transport_license", + visibility: [":__subpackages__"], + license_kinds: [ + "SPDX-license-identifier-Apache-2.0", + ], + license_text: [ + "NOTICE", + ], +} + cc_library { name: "libnos_transport", srcs: [ diff --git a/nugget/proto/Android.bp b/nugget/proto/Android.bp index e507ad6..b9f1220 100644 --- a/nugget/proto/Android.bp +++ b/nugget/proto/Android.bp @@ -14,6 +14,16 @@ // limitations under the License. // +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "external_nos_host_generic_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + // SPDX-license-identifier-BSD + default_applicable_licenses: ["external_nos_host_generic_license"], +} + cc_library { name: "libnosprotos", srcs: ["**/*.proto"], diff --git a/nugget/proto/nugget/app/avb/Android.bp b/nugget/proto/nugget/app/avb/Android.bp index 892a12a..136b9d5 100644 --- a/nugget/proto/nugget/app/avb/Android.bp +++ b/nugget/proto/nugget/app/avb/Android.bp @@ -14,6 +14,15 @@ // limitations under the License. // +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "external_nos_host_generic_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["external_nos_host_generic_license"], +} + genrule { name: "nos_app_avb_service_genc++", out: ["Avb.client.cpp"], diff --git a/nugget/proto/nugget/app/identity/Android.bp b/nugget/proto/nugget/app/identity/Android.bp index d05f639..b65297a 100644 --- a/nugget/proto/nugget/app/identity/Android.bp +++ b/nugget/proto/nugget/app/identity/Android.bp @@ -14,6 +14,15 @@ // limitations under the License. // +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "external_nos_host_generic_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["external_nos_host_generic_license"], +} + genrule { name: "nos_app_identity_service_genc++", out: ["Identity.client.cpp"], diff --git a/nugget/proto/nugget/app/keymaster/Android.bp b/nugget/proto/nugget/app/keymaster/Android.bp index 241b05e..32e3479 100644 --- a/nugget/proto/nugget/app/keymaster/Android.bp +++ b/nugget/proto/nugget/app/keymaster/Android.bp @@ -14,6 +14,15 @@ // limitations under the License. // +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "external_nos_host_generic_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["external_nos_host_generic_license"], +} + genrule { name: "nos_app_keymaster_service_genc++", out: ["Keymaster.client.cpp"], diff --git a/nugget/proto/nugget/app/weaver/Android.bp b/nugget/proto/nugget/app/weaver/Android.bp index 4d81059..6a1dbde 100644 --- a/nugget/proto/nugget/app/weaver/Android.bp +++ b/nugget/proto/nugget/app/weaver/Android.bp @@ -14,6 +14,15 @@ // limitations under the License. // +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "external_nos_host_generic_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["external_nos_host_generic_license"], +} + genrule { name: "nos_app_weaver_service_genc++", out: ["Weaver.client.cpp"], |