From 1bf1c4a556d3c6c28237788af080d5139b5ddac0 Mon Sep 17 00:00:00 2001
From: Bob Badour <bbadour@google.com>
Date: Fri, 19 Mar 2021 04:22:12 -0700
Subject: [PATCH] [LSC] Add LOCAL_LICENSE_KINDS to frameworks/base

Added SPDX-license-identifier-Apache-2.0 to:
  packages/SettingsLib/TwoTargetPreference/Android.bp
  services/api/Android.bp
  services/tests/servicestests/test-apps/PackageParsingTestManifests/Android.bp
  tests/FlickerTests/test-apps/Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all

Exempt-From-Owner-Approval: janitorial work
Change-Id: I12b67c8466fbb1973d6b06f40b88d4e1e88e9a91
---
 packages/SettingsLib/TwoTargetPreference/Android.bp | 9 +++++++++
 services/api/Android.bp                             | 8 +++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/packages/SettingsLib/TwoTargetPreference/Android.bp b/packages/SettingsLib/TwoTargetPreference/Android.bp
index f2e79b9ab53b9..078e8c3388efb 100644
--- a/packages/SettingsLib/TwoTargetPreference/Android.bp
+++ b/packages/SettingsLib/TwoTargetPreference/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 "frameworks_base_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-Apache-2.0
+    default_applicable_licenses: ["frameworks_base_license"],
+}
+
 android_library {
     name: "SettingsLibTwoTargetPreference",
 
diff --git a/services/api/Android.bp b/services/api/Android.bp
index b8ca5488c5cd6..bbc8c72b2eefa 100644
--- a/services/api/Android.bp
+++ b/services/api/Android.bp
@@ -14,6 +14,12 @@
 
 package {
     default_visibility: ["//visibility:private"],
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "frameworks_base_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-Apache-2.0
+    default_applicable_licenses: ["frameworks_base_license"],
 }
 
 filegroup {
@@ -26,4 +32,4 @@ filegroup {
     name: "non-updatable-system-server-removed.txt",
     srcs: ["non-updatable-removed.txt"],
     visibility: ["//frameworks/base/api"],
-}
\ No newline at end of file
+}