Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base" am: fcf6560011

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1588961

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0b9d7ed1e439f69ea73015173759c5ca2ee1ac89

framework/Android.bp

@@ -15,6 +15,15 @@
 //
 
 // TODO: use a java_library in the bootclasspath instead
+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"],
+}
+
 filegroup {
     name: "framework-connectivity-sources",
     srcs: [
@@ -26,4 +35,4 @@ filegroup {
         "//frameworks/base",
         "//packages/modules/Connectivity:__subpackages__",
     ],
-}
+}

service/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 "frameworks_base_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-Apache-2.0
+    default_applicable_licenses: ["frameworks_base_license"],
+}
+
 cc_library_shared {
     name: "libservice-connectivity",
     // TODO: build against the NDK (sdk_version: "30" for example)