Snap for 8429428 from 0c87406939c7918cd009622623f182d615bb80a9 to tm-releaseandroid-vts-13.0_r8android-vts-13.0_r7android-vts-13.0_r6android-vts-13.0_r5android-vts-13.0_r4android-vts-13.0_r3android-vts-13.0_r2android-vts-13.0_r1android-security-13.0.0_r9android-security-13.0.0_r8android-security-13.0.0_r7android-security-13.0.0_r6android-security-13.0.0_r5android-security-13.0.0_r4android-security-13.0.0_r3android-security-13.0.0_r2android-security-13.0.0_r17android-security-13.0.0_r16android-security-13.0.0_r15android-security-13.0.0_r14android-security-13.0.0_r13android-security-13.0.0_r12android-security-13.0.0_r11android-security-13.0.0_r10android-security-13.0.0_r1android-platform-13.0.0_r2android-platform-13.0.0_r1android-cts-13.0_r8android-cts-13.0_r7android-cts-13.0_r6android-cts-13.0_r5android-cts-13.0_r4android-cts-13.0_r3android-cts-13.0_r2android-cts-13.0_r1android-13.0.0_r8android-13.0.0_r7android-13.0.0_r6android-13.0.0_r5android-13.0.0_r4android-13.0.0_r31android-13.0.0_r3android-13.0.0_r2android-13.0.0_r12android-13.0.0_r1android13-tests-releaseandroid13-security-releaseandroid13-s3-releaseandroid13-s2-releaseandroid13-s1-releaseandroid13-release

Change-Id: I9ea6c269436cdfd52da30f4a6fff46035d25e7dc

2 files changed, 22 insertions, 1 deletions

diff --git a/Android.bp b/Android.bp
index 79cb861..efdc658 100644
--- a/Android.bp
+++ b/Android.bp
@@ -15,7 +15,17 @@
  */
 
 package {
-    default_applicable_licenses: ["Android-Apache-2.0"],
+    default_applicable_licenses: ["external_renderscript_intrinsics_replacement_toolkit_license"],
+}
+
+// See: http://go/android-license-faq
+license {
+    name: "external_renderscript_intrinsics_replacement_toolkit_license",
+    visibility: [":__subpackages__"],
+    license_kinds: [
+        "SPDX-license-identifier-Apache-2.0",
+    ],
+    license_text: ["LICENSE"],
 }
 
 android_library {
diff --git a/renderscript-toolkit/src/main/cpp/Android.bp b/renderscript-toolkit/src/main/cpp/Android.bp
index 9acad4f..c3acebf 100644
--- a/renderscript-toolkit/src/main/cpp/Android.bp
+++ b/renderscript-toolkit/src/main/cpp/Android.bp
@@ -14,6 +14,17 @@
  * 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 "external_renderscript_intrinsics_replacement_toolkit_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-Apache-2.0
+    default_applicable_licenses: [
+        "external_renderscript_intrinsics_replacement_toolkit_license",
+    ],
+}
+
 cc_defaults {
     name: "renderscripttoolkit_native_defaults",
     sdk_version: "current",