From 8e30736b3db61cafd19e0b896ca39caa23c863bd Mon Sep 17 00:00:00 2001 From: Bob Badour Date: Tue, 25 Jan 2022 12:21:06 -0800 Subject: [PATCH] Fix licenses and license texts. No legacy_notice code remains. Everything appears to be Android 1p. Test: m nothing Change-Id: I25b66acf26102862e3e35ec72c2261b020df834e --- Android.bp | 42 --------------------------------------- android-5.10/Android.bp | 6 +----- android-5.15/Android.bp | 6 +----- build/Android.bp | 6 +----- p/android-4.14/Android.bp | 6 +----- p/android-4.4/Android.bp | 6 +----- p/android-4.9/Android.bp | 6 +----- q/android-4.14/Android.bp | 6 +----- q/android-4.19/Android.bp | 6 +----- q/android-4.9/Android.bp | 6 +----- r/android-4.14/Android.bp | 6 +----- r/android-4.19/Android.bp | 6 +----- r/android-5.4/Android.bp | 6 +----- s/android-4.19/Android.bp | 6 +----- s/android-5.10/Android.bp | 6 +----- s/android-5.4/Android.bp | 6 +----- tools/Android.bp | 6 +----- 17 files changed, 16 insertions(+), 122 deletions(-) delete mode 100644 Android.bp diff --git a/Android.bp b/Android.bp deleted file mode 100644 index af5c292..0000000 --- a/Android.bp +++ /dev/null @@ -1,42 +0,0 @@ -// -// Copyright (C) 2021 The Android Open Source Project -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package { - default_applicable_licenses: ["kernel_configs_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: "kernel_configs_license", - visibility: [":__subpackages__"], - license_kinds: [ - "SPDX-license-identifier-Apache-2.0", - "legacy_notice", - ], - // large-scale-change unable to identify any license_text files -} diff --git a/android-5.10/Android.bp b/android-5.10/Android.bp index b81c9dc..f3b5f2f 100644 --- a/android-5.10/Android.bp +++ b/android-5.10/Android.bp @@ -14,11 +14,7 @@ package { // See: http://go/android-license-faq - // A large-scale-change added 'default_applicable_licenses' to import - // all of the 'license_kinds' from "kernel_configs_license" - // to get the below license kinds: - // legacy_notice - default_applicable_licenses: ["kernel_configs_license"], + default_applicable_licenses: ["Android-Apache-2.0"], } kernel_config { diff --git a/android-5.15/Android.bp b/android-5.15/Android.bp index 6d5f77c..20bfc0f 100644 --- a/android-5.15/Android.bp +++ b/android-5.15/Android.bp @@ -14,11 +14,7 @@ package { // See: http://go/android-license-faq - // A large-scale-change added 'default_applicable_licenses' to import - // all of the 'license_kinds' from "kernel_configs_license" - // to get the below license kinds: - // legacy_notice - default_applicable_licenses: ["kernel_configs_license"], + default_applicable_licenses: ["Android-Apache-2.0"], } kernel_config { diff --git a/build/Android.bp b/build/Android.bp index 7c47941..f2983eb 100644 --- a/build/Android.bp +++ b/build/Android.bp @@ -14,11 +14,7 @@ package { // See: http://go/android-license-faq - // A large-scale-change added 'default_applicable_licenses' to import - // all of the 'license_kinds' from "kernel_configs_license" - // to get the below license kinds: - // legacy_notice - default_applicable_licenses: ["kernel_configs_license"], + default_applicable_licenses: ["Android-Apache-2.0"], } bootstrap_go_package { diff --git a/p/android-4.14/Android.bp b/p/android-4.14/Android.bp index 4444de9..e4c4c40 100644 --- a/p/android-4.14/Android.bp +++ b/p/android-4.14/Android.bp @@ -14,11 +14,7 @@ package { // See: http://go/android-license-faq - // A large-scale-change added 'default_applicable_licenses' to import - // all of the 'license_kinds' from "kernel_configs_license" - // to get the below license kinds: - // legacy_notice - default_applicable_licenses: ["kernel_configs_license"], + default_applicable_licenses: ["Android-Apache-2.0"], } kernel_config { diff --git a/p/android-4.4/Android.bp b/p/android-4.4/Android.bp index b924ec2..ff08230 100644 --- a/p/android-4.4/Android.bp +++ b/p/android-4.4/Android.bp @@ -14,11 +14,7 @@ package { // See: http://go/android-license-faq - // A large-scale-change added 'default_applicable_licenses' to import - // all of the 'license_kinds' from "kernel_configs_license" - // to get the below license kinds: - // legacy_notice - default_applicable_licenses: ["kernel_configs_license"], + default_applicable_licenses: ["Android-Apache-2.0"], } kernel_config { diff --git a/p/android-4.9/Android.bp b/p/android-4.9/Android.bp index 43afed7..2a62d58 100644 --- a/p/android-4.9/Android.bp +++ b/p/android-4.9/Android.bp @@ -14,11 +14,7 @@ package { // See: http://go/android-license-faq - // A large-scale-change added 'default_applicable_licenses' to import - // all of the 'license_kinds' from "kernel_configs_license" - // to get the below license kinds: - // legacy_notice - default_applicable_licenses: ["kernel_configs_license"], + default_applicable_licenses: ["Android-Apache-2.0"], } kernel_config { diff --git a/q/android-4.14/Android.bp b/q/android-4.14/Android.bp index 2d58711..215f3bb 100644 --- a/q/android-4.14/Android.bp +++ b/q/android-4.14/Android.bp @@ -14,11 +14,7 @@ package { // See: http://go/android-license-faq - // A large-scale-change added 'default_applicable_licenses' to import - // all of the 'license_kinds' from "kernel_configs_license" - // to get the below license kinds: - // legacy_notice - default_applicable_licenses: ["kernel_configs_license"], + default_applicable_licenses: ["Android-Apache-2.0"], } kernel_config { diff --git a/q/android-4.19/Android.bp b/q/android-4.19/Android.bp index 6415070..61a1478 100644 --- a/q/android-4.19/Android.bp +++ b/q/android-4.19/Android.bp @@ -14,11 +14,7 @@ package { // See: http://go/android-license-faq - // A large-scale-change added 'default_applicable_licenses' to import - // all of the 'license_kinds' from "kernel_configs_license" - // to get the below license kinds: - // legacy_notice - default_applicable_licenses: ["kernel_configs_license"], + default_applicable_licenses: ["Android-Apache-2.0"], } kernel_config { diff --git a/q/android-4.9/Android.bp b/q/android-4.9/Android.bp index f9c2154..1b0cf2a 100644 --- a/q/android-4.9/Android.bp +++ b/q/android-4.9/Android.bp @@ -14,11 +14,7 @@ package { // See: http://go/android-license-faq - // A large-scale-change added 'default_applicable_licenses' to import - // all of the 'license_kinds' from "kernel_configs_license" - // to get the below license kinds: - // legacy_notice - default_applicable_licenses: ["kernel_configs_license"], + default_applicable_licenses: ["Android-Apache-2.0"], } kernel_config { diff --git a/r/android-4.14/Android.bp b/r/android-4.14/Android.bp index a9c0f3a..f6089bd 100644 --- a/r/android-4.14/Android.bp +++ b/r/android-4.14/Android.bp @@ -14,11 +14,7 @@ package { // See: http://go/android-license-faq - // A large-scale-change added 'default_applicable_licenses' to import - // all of the 'license_kinds' from "kernel_configs_license" - // to get the below license kinds: - // legacy_notice - default_applicable_licenses: ["kernel_configs_license"], + default_applicable_licenses: ["Android-Apache-2.0"], } kernel_config { diff --git a/r/android-4.19/Android.bp b/r/android-4.19/Android.bp index 38b9688..9d00624 100644 --- a/r/android-4.19/Android.bp +++ b/r/android-4.19/Android.bp @@ -14,11 +14,7 @@ package { // See: http://go/android-license-faq - // A large-scale-change added 'default_applicable_licenses' to import - // all of the 'license_kinds' from "kernel_configs_license" - // to get the below license kinds: - // legacy_notice - default_applicable_licenses: ["kernel_configs_license"], + default_applicable_licenses: ["Android-Apache-2.0"], } kernel_config { diff --git a/r/android-5.4/Android.bp b/r/android-5.4/Android.bp index 28d3fa2..0ea8bbc 100644 --- a/r/android-5.4/Android.bp +++ b/r/android-5.4/Android.bp @@ -14,11 +14,7 @@ package { // See: http://go/android-license-faq - // A large-scale-change added 'default_applicable_licenses' to import - // all of the 'license_kinds' from "kernel_configs_license" - // to get the below license kinds: - // legacy_notice - default_applicable_licenses: ["kernel_configs_license"], + default_applicable_licenses: ["Android-Apache-2.0"], } kernel_config { diff --git a/s/android-4.19/Android.bp b/s/android-4.19/Android.bp index 3b49890..9fdc318 100644 --- a/s/android-4.19/Android.bp +++ b/s/android-4.19/Android.bp @@ -14,11 +14,7 @@ package { // See: http://go/android-license-faq - // A large-scale-change added 'default_applicable_licenses' to import - // all of the 'license_kinds' from "kernel_configs_license" - // to get the below license kinds: - // legacy_notice - default_applicable_licenses: ["kernel_configs_license"], + default_applicable_licenses: ["Android-Apache-2.0"], } kernel_config { diff --git a/s/android-5.10/Android.bp b/s/android-5.10/Android.bp index b27146a..0d2e70d 100644 --- a/s/android-5.10/Android.bp +++ b/s/android-5.10/Android.bp @@ -14,11 +14,7 @@ package { // See: http://go/android-license-faq - // A large-scale-change added 'default_applicable_licenses' to import - // all of the 'license_kinds' from "kernel_configs_license" - // to get the below license kinds: - // legacy_notice - default_applicable_licenses: ["kernel_configs_license"], + default_applicable_licenses: ["Android-Apache-2.0"], } kernel_config { diff --git a/s/android-5.4/Android.bp b/s/android-5.4/Android.bp index 84e32cf..ed1f2bf 100644 --- a/s/android-5.4/Android.bp +++ b/s/android-5.4/Android.bp @@ -14,11 +14,7 @@ package { // See: http://go/android-license-faq - // A large-scale-change added 'default_applicable_licenses' to import - // all of the 'license_kinds' from "kernel_configs_license" - // to get the below license kinds: - // legacy_notice - default_applicable_licenses: ["kernel_configs_license"], + default_applicable_licenses: ["Android-Apache-2.0"], } kernel_config { diff --git a/tools/Android.bp b/tools/Android.bp index 93aa598..4149318 100644 --- a/tools/Android.bp +++ b/tools/Android.bp @@ -1,10 +1,6 @@ package { // See: http://go/android-license-faq - // A large-scale-change added 'default_applicable_licenses' to import - // all of the 'license_kinds' from "kernel_configs_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["kernel_configs_license"], + default_applicable_licenses: ["Android-Apache-2.0"], } python_binary_host {