diff options
| author | Bob Badour <bbadour@google.com> | 2022-04-08 20:57:57 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-04-08 20:57:57 +0000 |
| commit | 945eb773585b3c6f78ae8d9ecdf2abb5038be0ee (patch) | |
| tree | 539f3bb51e3bfdc06de50637cc40e12fb5a2ee83 | |
| parent | 439cd57a0fa722817e52cd239e21fe97ee72a02c (diff) | |
| parent | 0c87406939c7918cd009622623f182d615bb80a9 (diff) | |
| download | renderscript-intrinsics-replacement-toolkit-945eb773585b3c6f78ae8d9ecdf2abb5038be0ee.tar.gz | |
Add LOCAL_LICENSE_KINDS to external/renderscript-intrinsics-replacement-toolkit am: 0c8e76d8f9 am: e05cd7c937 am: dc3d9ea436 am: 0c87406939
Original change: https://android-review.googlesource.com/c/platform/external/renderscript-intrinsics-replacement-toolkit/+/2059070
Change-Id: I6e37fb8f3db6ba00d851b9b34beb4424c0d6275c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | Android.bp | 12 | ||||
| -rw-r--r-- | renderscript-toolkit/src/main/cpp/Android.bp | 11 |
2 files changed, 22 insertions, 1 deletions
@@ -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", |