diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2021-06-21 14:59:52 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2021-06-21 14:59:52 +0000 |
commit | 5fc0fab1cc62937559c51e426994cdb2ff9cc04c (patch) | |
tree | 769a69fcd8a609c266da80b48d2de307c838b5cc /transport/allocator/1.0 | |
parent | c12f9b9aa5a87e996f5e69f3988f417aab8dd01b (diff) | |
parent | e1831a391c1436c2ac00dee8bfee6a5dbbfee150 (diff) | |
download | libhidl-5fc0fab1cc62937559c51e426994cdb2ff9cc04c.tar.gz |
Snap for 7478067 from e1831a391c1436c2ac00dee8bfee6a5dbbfee150 to mainline-cellbroadcast-release
Change-Id: Ib1cf39b0ba13f8e8e66605e9013bd162939dc079
Diffstat (limited to 'transport/allocator/1.0')
-rw-r--r-- | transport/allocator/1.0/Android.bp | 16 | ||||
-rw-r--r-- | transport/allocator/1.0/default/Android.bp | 9 | ||||
-rw-r--r-- | transport/allocator/1.0/utils/Android.bp | 9 | ||||
-rw-r--r-- | transport/allocator/1.0/vts/functional/Android.bp | 10 |
4 files changed, 40 insertions, 4 deletions
diff --git a/transport/allocator/1.0/Android.bp b/transport/allocator/1.0/Android.bp index 6da3793..0cc3b62 100644 --- a/transport/allocator/1.0/Android.bp +++ b/transport/allocator/1.0/Android.bp @@ -1,13 +1,19 @@ // 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 "system_libhidl_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["system_libhidl_license"], +} + hidl_interface { name: "android.hidl.allocator@1.0", root: "android.hidl", // TODO(b/153609531): remove when no longer needed. native_bridge_supported: true, - vndk: { - enabled: true, - }, srcs: [ "IAllocator.hal", ], @@ -15,4 +21,8 @@ hidl_interface { "android.hidl.base@1.0", ], gen_java: false, + apex_available: [ + "//apex_available:anyapex", + "//apex_available:platform", + ], } diff --git a/transport/allocator/1.0/default/Android.bp b/transport/allocator/1.0/default/Android.bp index 1116f1d..42abe9c 100644 --- a/transport/allocator/1.0/default/Android.bp +++ b/transport/allocator/1.0/default/Android.bp @@ -12,6 +12,15 @@ // See the License for the specific language governing permissions and // 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 "system_libhidl_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["system_libhidl_license"], +} + cc_binary { name: "android.hidl.allocator@1.0-service", relative_install_path: "hw", diff --git a/transport/allocator/1.0/utils/Android.bp b/transport/allocator/1.0/utils/Android.bp index b324ef1..f21047d 100644 --- a/transport/allocator/1.0/utils/Android.bp +++ b/transport/allocator/1.0/utils/Android.bp @@ -12,6 +12,15 @@ // See the License for the specific language governing permissions and // 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 "system_libhidl_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["system_libhidl_license"], +} + cc_library { name: "libhidlallocatorutils", vendor_available: true, diff --git a/transport/allocator/1.0/vts/functional/Android.bp b/transport/allocator/1.0/vts/functional/Android.bp index 31d9821..f53fc4f 100644 --- a/transport/allocator/1.0/vts/functional/Android.bp +++ b/transport/allocator/1.0/vts/functional/Android.bp @@ -14,6 +14,15 @@ // 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 "system_libhidl_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["system_libhidl_license"], +} + cc_test { name: "VtsHidlAllocatorV1_0TargetTest", defaults: ["VtsHalTargetTestDefaults"], @@ -26,4 +35,3 @@ cc_test { ], test_suites: ["general-tests", "vts"], } - |