summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2022-08-05 22:39:26 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-05 22:39:26 +0000
commitaf00b3f79f5a2b6dc17a2061e8ab516ca052bdb5 (patch)
tree720271face744ad6f53464e0af2851c7f6b2b959
parent2300724f7a808208dde93fb0a5d1f9b7b36de925 (diff)
parent9c107f157f08b24f454d8def11d0e2f4aa979d50 (diff)
Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/native" am: 5a19bd1064 am: 9c107f157f
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2175887 Change-Id: Idd8e0e7475cf36b43b4b95215731e7c74386861c 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: [