From 4c7858c848c54fe618eaf38b66118c51d09809e4 Mon Sep 17 00:00:00 2001 From: Bob Badour Date: Fri, 12 Feb 2021 15:40:29 -0800 Subject: [PATCH] [LSC] Add LOCAL_LICENSE_KINDS to system/security Added SPDX-license-identifier-Apache-2.0 to: fsverity_init/Android.bp identity/Android.bp keystore/tests/Android.bp keystore2/Android.bp keystore2/aaid/Android.bp keystore2/aidl/Android.bp keystore2/apc_compat/Android.bp keystore2/selinux/Android.bp keystore2/src/crypto/Android.bp keystore2/src/km_compat/Android.bp ondevice-signing/Android.bp provisioner/Android.bp Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD to: Android.bp keystore/Android.bp Added SPDX-license-identifier-BSD to: keystore-engine/Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: Ic9e19695bd19c3f127dfd545df60e4c9df89af77 --- Android.bp | 30 ++++++++++++++++++++++++++++++ fsverity_init/Android.bp | 9 +++++++++ identity/Android.bp | 9 +++++++++ keystore-engine/Android.bp | 9 +++++++++ keystore/Android.bp | 10 ++++++++++ keystore/tests/Android.bp | 9 +++++++++ keystore2/Android.bp | 9 +++++++++ keystore2/aaid/Android.bp | 9 +++++++++ keystore2/aidl/Android.bp | 9 +++++++++ keystore2/apc_compat/Android.bp | 9 +++++++++ keystore2/selinux/Android.bp | 9 +++++++++ keystore2/src/crypto/Android.bp | 9 +++++++++ keystore2/src/km_compat/Android.bp | 9 +++++++++ ondevice-signing/Android.bp | 9 +++++++++ provisioner/Android.bp | 9 +++++++++ 15 files changed, 157 insertions(+) diff --git a/Android.bp b/Android.bp index b44c2960..4a0253cf 100644 --- a/Android.bp +++ b/Android.bp @@ -1 +1,31 @@ +package { + default_applicable_licenses: ["system_security_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: "system_security_license", + visibility: [":__subpackages__"], + license_kinds: [ + "SPDX-license-identifier-Apache-2.0", + "SPDX-license-identifier-BSD", + ], + license_text: [ + "NOTICE", + ], +} + subdirs = ["*"] diff --git a/fsverity_init/Android.bp b/fsverity_init/Android.bp index 3c9ade00..39d4e6b6 100644 --- a/fsverity_init/Android.bp +++ b/fsverity_init/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 "system_security_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["system_security_license"], +} + cc_binary { name: "fsverity_init", srcs: [ diff --git a/identity/Android.bp b/identity/Android.bp index e6d77c87..ed8ff2f3 100644 --- a/identity/Android.bp +++ b/identity/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 "system_security_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["system_security_license"], +} + cc_defaults { name: "identity_defaults", cflags: [ diff --git a/keystore-engine/Android.bp b/keystore-engine/Android.bp index 6512c669..b8127d35 100644 --- a/keystore-engine/Android.bp +++ b/keystore-engine/Android.bp @@ -12,6 +12,15 @@ // See the License for the specific language governing permissions and // 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 "system_security_license" + // to get the below license kinds: + // SPDX-license-identifier-BSD + default_applicable_licenses: ["system_security_license"], +} + cc_library_shared { name: "libkeystore-engine", diff --git a/keystore/Android.bp b/keystore/Android.bp index 45b721b6..7278cee6 100644 --- a/keystore/Android.bp +++ b/keystore/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 "system_security_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + // SPDX-license-identifier-BSD + default_applicable_licenses: ["system_security_license"], +} + cc_defaults { name: "keystore_defaults", diff --git a/keystore/tests/Android.bp b/keystore/tests/Android.bp index 883e0200..327eb935 100644 --- a/keystore/tests/Android.bp +++ b/keystore/tests/Android.bp @@ -1,5 +1,14 @@ // Unit test for AuthTokenTable +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "system_security_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["system_security_license"], +} + cc_test { cflags: [ "-Wall", diff --git a/keystore2/Android.bp b/keystore2/Android.bp index 0a5fb298..05bf699e 100644 --- a/keystore2/Android.bp +++ b/keystore2/Android.bp @@ -12,6 +12,15 @@ // See the License for the specific language governing permissions and // 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 "system_security_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["system_security_license"], +} + rust_library { name: "libkeystore2", crate_name: "keystore2", diff --git a/keystore2/aaid/Android.bp b/keystore2/aaid/Android.bp index 23294005..d27fdf6e 100644 --- a/keystore2/aaid/Android.bp +++ b/keystore2/aaid/Android.bp @@ -12,6 +12,15 @@ // See the License for the specific language governing permissions and // 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 "system_security_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["system_security_license"], +} + cc_library { name: "libkeystore2_aaid", srcs: [ diff --git a/keystore2/aidl/Android.bp b/keystore2/aidl/Android.bp index 36cff163..425f849e 100644 --- a/keystore2/aidl/Android.bp +++ b/keystore2/aidl/Android.bp @@ -12,6 +12,15 @@ // See the License for the specific language governing permissions and // 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 "system_security_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["system_security_license"], +} + aidl_interface { name: "android.security.attestationmanager", srcs: [ "android/security/attestationmanager/*.aidl", ], diff --git a/keystore2/apc_compat/Android.bp b/keystore2/apc_compat/Android.bp index 405e9b88..9519c8eb 100644 --- a/keystore2/apc_compat/Android.bp +++ b/keystore2/apc_compat/Android.bp @@ -12,6 +12,15 @@ // See the License for the specific language governing permissions and // 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 "system_security_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["system_security_license"], +} + cc_library { name: "libkeystore2_apc_compat", srcs: [ diff --git a/keystore2/selinux/Android.bp b/keystore2/selinux/Android.bp index acbf5ef0..18063d39 100644 --- a/keystore2/selinux/Android.bp +++ b/keystore2/selinux/Android.bp @@ -12,6 +12,15 @@ // See the License for the specific language governing permissions and // 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 "system_security_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["system_security_license"], +} + rust_library { name: "libkeystore2_selinux", crate_name: "keystore2_selinux", diff --git a/keystore2/src/crypto/Android.bp b/keystore2/src/crypto/Android.bp index 9ecd823d..7673400d 100644 --- a/keystore2/src/crypto/Android.bp +++ b/keystore2/src/crypto/Android.bp @@ -12,6 +12,15 @@ // See the License for the specific language governing permissions and // 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 "system_security_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["system_security_license"], +} + rust_library { name: "libkeystore2_crypto_rust", crate_name: "keystore2_crypto", diff --git a/keystore2/src/km_compat/Android.bp b/keystore2/src/km_compat/Android.bp index 2180935e..fa214a7e 100644 --- a/keystore2/src/km_compat/Android.bp +++ b/keystore2/src/km_compat/Android.bp @@ -12,6 +12,15 @@ // See the License for the specific language governing permissions and // 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 "system_security_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["system_security_license"], +} + rust_library { name: "libkeystore2_km_compat", crate_name: "keystore2_km_compat", diff --git a/ondevice-signing/Android.bp b/ondevice-signing/Android.bp index 8da28f2c..d47a04fe 100644 --- a/ondevice-signing/Android.bp +++ b/ondevice-signing/Android.bp @@ -14,6 +14,15 @@ // List of clang-tidy checks that are reported as errors. // Please keep this list ordered lexicographically. +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "system_security_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["system_security_license"], +} + tidy_errors = [ "cert-err34-c", "google-default-arguments", diff --git a/provisioner/Android.bp b/provisioner/Android.bp index c1c8d15a..d3f06fe8 100644 --- a/provisioner/Android.bp +++ b/provisioner/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 "system_security_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["system_security_license"], +} + aidl_interface { name: "android.security.provisioner", unstable: true,