summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2022-08-06 02:16:53 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-06 02:16:53 +0000
commit71ad723d0bd1a9451deea29f45602027f12a213c (patch)
tree1de4fc8a9935a32b1eae9c9799341d3bc858b59f
parent433221fece28438702cb0d5ec28944045fcb843f (diff)
parenta5991cc7a16e6200a46d1c728bdee51518e199ef (diff)
Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/native" am: 5a19bd1064 am: 9c107f157f am: af00b3f79f am: a5991cc7a1
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2175887 Change-Id: Ideff3a46412950da5d7117616cb1a3cd858a316d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--libs/cputimeinstate/fuzz/cputimeinstate_fuzzer/Android.bp9
-rw-r--r--libs/sensor/fuzz/bittube_fuzzer/Android.bp9
2 files changed, 18 insertions, 0 deletions
diff --git a/libs/cputimeinstate/fuzz/cputimeinstate_fuzzer/Android.bp b/libs/cputimeinstate/fuzz/cputimeinstate_fuzzer/Android.bp
index 416e34e3d2..2399acd156 100644
--- a/libs/cputimeinstate/fuzz/cputimeinstate_fuzzer/Android.bp
+++ b/libs/cputimeinstate/fuzz/cputimeinstate_fuzzer/Android.bp
@@ -16,6 +16,15 @@
*
*****************************************************************************
*/
+package {
+ // See: http://go/android-license-faq
+ // A large-scale-change added 'default_applicable_licenses' to import
+ // all of the 'license_kinds' from "frameworks_native_license"
+ // to get the below license kinds:
+ // SPDX-license-identifier-Apache-2.0
+ default_applicable_licenses: ["frameworks_native_license"],
+}
+
cc_fuzz {
name: "cputimeinstate_fuzzer",
srcs: [
diff --git a/libs/sensor/fuzz/bittube_fuzzer/Android.bp b/libs/sensor/fuzz/bittube_fuzzer/Android.bp
index 5d8f4019a8..7af22cc7c1 100644
--- a/libs/sensor/fuzz/bittube_fuzzer/Android.bp
+++ b/libs/sensor/fuzz/bittube_fuzzer/Android.bp
@@ -16,6 +16,15 @@
*
*****************************************************************************
*/
+package {
+ // See: http://go/android-license-faq
+ // A large-scale-change added 'default_applicable_licenses' to import
+ // all of the 'license_kinds' from "frameworks_native_license"
+ // to get the below license kinds:
+ // SPDX-license-identifier-Apache-2.0
+ default_applicable_licenses: ["frameworks_native_license"],
+}
+
cc_fuzz {
name: "bittube_fuzzer",
srcs: [