From 0e73d05c74e7e2652e732eded89650754ec802e5 Mon Sep 17 00:00:00 2001 From: Bob Badour Date: Fri, 12 Feb 2021 17:08:01 -0800 Subject: [PATCH] [LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Settings Added SPDX-license-identifier-Apache-2.0 to: Android.bp protos/Android.bp tests/anomaly-tester/Android.bp tests/perftests/Android.bp tests/robotests/Android.bp tests/uitests/Android.bp tests/unit/Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I81f11a66b5977cb5096e262819084706af5fa54c Merged-in: I81f11a66b5977cb5096e262819084706af5fa54c --- Android.bp | 17 +++++++++++++++++ protos/Android.bp | 11 ++++++++++- tests/anomaly-tester/Android.bp | 9 +++++++++ .../InstrumentedEntitlementApp/Android.bp | 9 +++++++++ tests/perftests/Android.bp | 9 +++++++++ tests/robotests/Android.bp | 9 +++++++++ tests/uitests/Android.bp | 9 +++++++++ tests/unit/Android.bp | 9 +++++++++ 8 files changed, 81 insertions(+), 1 deletion(-) diff --git a/Android.bp b/Android.bp index 5470e708143..2dfe3fdff67 100644 --- a/Android.bp +++ b/Android.bp @@ -1,3 +1,20 @@ +package { + default_applicable_licenses: ["packages_apps_Settings_license"], +} + +// Added automatically by a large-scale-change +// See: http://go/android-license-faq +license { + name: "packages_apps_Settings_license", + visibility: [":__subpackages__"], + license_kinds: [ + "SPDX-license-identifier-Apache-2.0", + ], + license_text: [ + "NOTICE", + ], +} + java_library { name: "settings-logtags", srcs: ["src/**/*.logtags"], diff --git a/protos/Android.bp b/protos/Android.bp index 5184218df63..e09b941924d 100644 --- a/protos/Android.bp +++ b/protos/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 "packages_apps_Settings_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["packages_apps_Settings_license"], +} + java_library_static { name: "settings-contextual-card-protos-lite", host_supported: true, @@ -14,4 +23,4 @@ java_library_static { type: "lite", }, srcs: ["settings_log_bridge.proto"], -} \ No newline at end of file +} diff --git a/tests/anomaly-tester/Android.bp b/tests/anomaly-tester/Android.bp index 29181af61ed..c897d75fe37 100644 --- a/tests/anomaly-tester/Android.bp +++ b/tests/anomaly-tester/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 "packages_apps_Settings_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["packages_apps_Settings_license"], +} + android_test { name: "AnomalyTester", diff --git a/tests/legacy_unit/InstrumentedEntitlementApp/Android.bp b/tests/legacy_unit/InstrumentedEntitlementApp/Android.bp index dacd32aa163..1ec108a53bc 100644 --- a/tests/legacy_unit/InstrumentedEntitlementApp/Android.bp +++ b/tests/legacy_unit/InstrumentedEntitlementApp/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 "packages_apps_Settings_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["packages_apps_Settings_license"], +} + android_test { name: "InstrumentedEntitlementApp", srcs: ["src/**/*.java"], diff --git a/tests/perftests/Android.bp b/tests/perftests/Android.bp index 1ba5d9c432a..c03c57f3742 100644 --- a/tests/perftests/Android.bp +++ b/tests/perftests/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 "packages_apps_Settings_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["packages_apps_Settings_license"], +} + android_test { name: "SettingsPerfTests", diff --git a/tests/robotests/Android.bp b/tests/robotests/Android.bp index f6ad049ef3d..a0e9820243b 100644 --- a/tests/robotests/Android.bp +++ b/tests/robotests/Android.bp @@ -2,6 +2,15 @@ // Build SettingsRoboTestStub.apk which includes test-only resources.# //############################################################ +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "packages_apps_Settings_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["packages_apps_Settings_license"], +} + android_app { name: "SettingsRoboTestStub", defaults: [ diff --git a/tests/uitests/Android.bp b/tests/uitests/Android.bp index 8a3e374ff43..8636c813282 100644 --- a/tests/uitests/Android.bp +++ b/tests/uitests/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 "packages_apps_Settings_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["packages_apps_Settings_license"], +} + android_test { name: "SettingsUITests", platform_apis: true, diff --git a/tests/unit/Android.bp b/tests/unit/Android.bp index b857a0a92e2..b55a788988f 100644 --- a/tests/unit/Android.bp +++ b/tests/unit/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 "packages_apps_Settings_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["packages_apps_Settings_license"], +} + android_test { name: "SettingsUnitTests",