diff options
| author | Bob Badour <bbadour@google.com> | 2021-03-26 06:45:39 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-03-26 06:45:39 +0000 |
| commit | 04fc3da64952b107330dd29e611ebe16c98c20eb (patch) | |
| tree | 872cee7ec79033f0a83235614b9f5add73c10224 | |
| parent | 904b4f8a1ed21f43b71ca97f774ddc2e6cf89e44 (diff) | |
| parent | 304e9ea675989631bc83a39d4eb007cc1ac540fe (diff) | |
Merge "[LSC] Add LOCAL_LICENSE_KINDS to hardware/interfaces" into sc-dev
| -rw-r--r-- | automotive/vehicle/2.0/vts/functional/Android.bp | 9 | ||||
| -rw-r--r-- | media/c2/1.2/Android.bp | 9 |
2 files changed, 18 insertions, 0 deletions
diff --git a/automotive/vehicle/2.0/vts/functional/Android.bp b/automotive/vehicle/2.0/vts/functional/Android.bp index 9f1dd6fb86..e64e942a0e 100644 --- a/automotive/vehicle/2.0/vts/functional/Android.bp +++ b/automotive/vehicle/2.0/vts/functional/Android.bp @@ -1,3 +1,12 @@ +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "hardware_interfaces_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["hardware_interfaces_license"], +} + cc_test { name: "VtsHalAutomotiveVehicleV2_0TargetTest", defaults: [ diff --git a/media/c2/1.2/Android.bp b/media/c2/1.2/Android.bp index 10947219fb..6d3e74d2b1 100644 --- a/media/c2/1.2/Android.bp +++ b/media/c2/1.2/Android.bp @@ -1,5 +1,14 @@ // This file is autogenerated by hidl-gen -Landroidbp. +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "hardware_interfaces_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["hardware_interfaces_license"], +} + hidl_interface { name: "android.hardware.media.c2@1.2", root: "android.hardware", |