aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Badour <bbadour@google.com>2022-04-08 21:25:09 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-04-08 21:25:09 +0000
commit241f555fe954b1e0a0bd49fdd28ff512cc160524 (patch)
tree539f3bb51e3bfdc06de50637cc40e12fb5a2ee83
parent95778dfbff4ff91fdbbc9312fac7b0b8831d0384 (diff)
parent945eb773585b3c6f78ae8d9ecdf2abb5038be0ee (diff)
downloadrenderscript-intrinsics-replacement-toolkit-android13-qpr3-c-s8-release.tar.gz
Add LOCAL_LICENSE_KINDS to external/renderscript-intrinsics-replacement-toolkit am: 0c8e76d8f9 am: e05cd7c937 am: dc3d9ea436 am: 0c87406939 am: 945eb77358android-13.0.0_r83android-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r79android-13.0.0_r78android-13.0.0_r77android-13.0.0_r76android-13.0.0_r75android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r71android-13.0.0_r70android-13.0.0_r69android-13.0.0_r68android-13.0.0_r67android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r63android-13.0.0_r62android-13.0.0_r61android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android-13.0.0_r56android-13.0.0_r54android-13.0.0_r53android-13.0.0_r52android-13.0.0_r51android-13.0.0_r50android-13.0.0_r49android-13.0.0_r48android-13.0.0_r47android-13.0.0_r46android-13.0.0_r45android-13.0.0_r44android-13.0.0_r43android-13.0.0_r42android-13.0.0_r41android-13.0.0_r40android-13.0.0_r39android-13.0.0_r38android-13.0.0_r37android-13.0.0_r36android-13.0.0_r35android-13.0.0_r34android-13.0.0_r33android-13.0.0_r32android13-qpr3-s9-releaseandroid13-qpr3-s8-releaseandroid13-qpr3-s7-releaseandroid13-qpr3-s6-releaseandroid13-qpr3-s5-releaseandroid13-qpr3-s4-releaseandroid13-qpr3-s3-releaseandroid13-qpr3-s2-releaseandroid13-qpr3-s14-releaseandroid13-qpr3-s13-releaseandroid13-qpr3-s12-releaseandroid13-qpr3-s11-releaseandroid13-qpr3-s10-releaseandroid13-qpr3-s1-releaseandroid13-qpr3-releaseandroid13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-releaseandroid13-qpr2-s9-releaseandroid13-qpr2-s8-releaseandroid13-qpr2-s7-releaseandroid13-qpr2-s6-releaseandroid13-qpr2-s5-releaseandroid13-qpr2-s3-releaseandroid13-qpr2-s2-releaseandroid13-qpr2-s12-releaseandroid13-qpr2-s11-releaseandroid13-qpr2-s10-releaseandroid13-qpr2-s1-releaseandroid13-qpr2-releaseandroid13-qpr2-b-s1-releaseandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-release
Original change: https://android-review.googlesource.com/c/platform/external/renderscript-intrinsics-replacement-toolkit/+/2059070 Change-Id: I93ebfc96e26f6f094149f9452ea46128800fb8e3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp12
-rw-r--r--renderscript-toolkit/src/main/cpp/Android.bp11
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",