Merge "[LSC] Add LOCAL_LICENSE_KINDS to prebuilts/runtime"android-s-beta-2android-s-beta-1

11 files changed, 67 insertions, 0 deletions

diff --git a/mainline/conscrypt/host-exports/Android.bp b/mainline/conscrypt/host-exports/Android.bp
index 85e35328..d318d891 100755
--- a/mainline/conscrypt/host-exports/Android.bp
+++ b/mainline/conscrypt/host-exports/Android.bp
@@ -1,5 +1,9 @@
 // This is auto-generated. DO NOT EDIT.
 
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 java_import {
     name: "conscrypt-module-host-exports_conscrypt-unbundled@current",
     sdk_member_name: "conscrypt-unbundled",
diff --git a/mainline/conscrypt/sdk/Android.bp b/mainline/conscrypt/sdk/Android.bp
index d3044399..9f2166a3 100755
--- a/mainline/conscrypt/sdk/Android.bp
+++ b/mainline/conscrypt/sdk/Android.bp
@@ -1,5 +1,9 @@
 // This is auto-generated. DO NOT EDIT.
 
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 java_import {
     name: "conscrypt-module-sdk_conscrypt@current",
     sdk_member_name: "conscrypt",
diff --git a/mainline/conscrypt/test-exports/Android.bp b/mainline/conscrypt/test-exports/Android.bp
index 60aa2289..75cb6015 100755
--- a/mainline/conscrypt/test-exports/Android.bp
+++ b/mainline/conscrypt/test-exports/Android.bp
@@ -1,5 +1,9 @@
 // This is auto-generated. DO NOT EDIT.
 
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 java_import {
     name: "conscrypt-module-test-exports_conscrypt-for-host@current",
     sdk_member_name: "conscrypt-for-host",
diff --git a/mainline/i18n/sdk/Android.bp b/mainline/i18n/sdk/Android.bp
index b71ee047..176e555b 100755
--- a/mainline/i18n/sdk/Android.bp
+++ b/mainline/i18n/sdk/Android.bp
@@ -1,5 +1,16 @@
 // This is auto-generated. DO NOT EDIT.
 
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "prebuilts_runtime_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-Apache-2.0
+    //   SPDX-license-identifier-Unicode-DFS
+    //   legacy_unencumbered
+    default_applicable_licenses: ["prebuilts_runtime_license"],
+}
+
 java_import {
     name: "i18n-module-sdk_core-icu4j@current",
     sdk_member_name: "core-icu4j",
diff --git a/mainline/i18n/test-exports/Android.bp b/mainline/i18n/test-exports/Android.bp
index cf1949a7..d46e4240 100755
--- a/mainline/i18n/test-exports/Android.bp
+++ b/mainline/i18n/test-exports/Android.bp
@@ -1,5 +1,16 @@
 // This is auto-generated. DO NOT EDIT.
 
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "prebuilts_runtime_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-Apache-2.0
+    //   SPDX-license-identifier-BSD
+    //   SPDX-license-identifier-Unicode-DFS
+    default_applicable_licenses: ["prebuilts_runtime_license"],
+}
+
 java_import {
     name: "i18n-module-test-exports_core-icu4j-for-host@current",
     sdk_member_name: "core-icu4j-for-host",
diff --git a/mainline/platform/sdk/Android.bp b/mainline/platform/sdk/Android.bp
index a4dafdbd..722552a0 100755
--- a/mainline/platform/sdk/Android.bp
+++ b/mainline/platform/sdk/Android.bp
@@ -1,5 +1,9 @@
 // This is auto-generated. DO NOT EDIT.
 
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 cc_prebuilt_library {
     name: "platform-mainline-sdk_liblog@current",
     sdk_member_name: "liblog",
diff --git a/mainline/platform/test-exports/Android.bp b/mainline/platform/test-exports/Android.bp
index 7f31c270..41465b6b 100755
--- a/mainline/platform/test-exports/Android.bp
+++ b/mainline/platform/test-exports/Android.bp
@@ -1,5 +1,9 @@
 // This is auto-generated. DO NOT EDIT.
 
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 cc_prebuilt_library_shared {
     name: "platform-mainline-test-exports_libtombstoned_client@current",
     sdk_member_name: "libtombstoned_client",
diff --git a/mainline/runtime/host-exports/Android.bp b/mainline/runtime/host-exports/Android.bp
index c26999ab..b149b8d8 100755
--- a/mainline/runtime/host-exports/Android.bp
+++ b/mainline/runtime/host-exports/Android.bp
@@ -1,5 +1,9 @@
 // This is auto-generated. DO NOT EDIT.
 
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 cc_prebuilt_binary {
     name: "runtime-module-host-exports_linkerconfig@current",
     sdk_member_name: "linkerconfig",
diff --git a/mainline/runtime/sdk/Android.bp b/mainline/runtime/sdk/Android.bp
index 89362f76..0c21e45e 100755
--- a/mainline/runtime/sdk/Android.bp
+++ b/mainline/runtime/sdk/Android.bp
@@ -1,5 +1,18 @@
 // This is auto-generated. DO NOT EDIT.
 
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "prebuilts_runtime_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-Apache-2.0
+    //   SPDX-license-identifier-BSD
+    //   SPDX-license-identifier-ISC
+    //   SPDX-license-identifier-MIT
+    //   legacy_unencumbered
+    default_applicable_licenses: ["prebuilts_runtime_license"],
+}
+
 cc_prebuilt_library_headers {
     name: "runtime-module-sdk_bionic_libc_platform_headers@current",
     sdk_member_name: "bionic_libc_platform_headers",
diff --git a/mainline/statsd/module-sdk-for-art/Android.bp b/mainline/statsd/module-sdk-for-art/Android.bp
index 9b20c943..6f7e1da9 100755
--- a/mainline/statsd/module-sdk-for-art/Android.bp
+++ b/mainline/statsd/module-sdk-for-art/Android.bp
@@ -1,5 +1,9 @@
 // This is auto-generated. DO NOT EDIT.
 
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 cc_prebuilt_library_shared {
     name: "statsd-module-sdk-for-art_libstatssocket@current",
     sdk_member_name: "libstatssocket",
diff --git a/mainline/tzdata/test-exports/Android.bp b/mainline/tzdata/test-exports/Android.bp
index 1c312556..ea4ba53c 100755
--- a/mainline/tzdata/test-exports/Android.bp
+++ b/mainline/tzdata/test-exports/Android.bp
@@ -1,5 +1,9 @@
 // This is auto-generated. DO NOT EDIT.
 
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 java_import {
     name: "tzdata-module-test-exports_tzdata-testing@current",
     sdk_member_name: "tzdata-testing",