diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2023-10-05 01:33:07 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-10-05 01:33:07 +0000 |
| commit | cdf774ff92252cf78067f53343a17c47976b3edc (patch) | |
| tree | b420b9828d5d392af721816e04c932e26d7cd1b9 | |
| parent | baf321880a9cb0a0e0d6d98ffe92760087c5c632 (diff) | |
| parent | ed0f1aa734465312d62288c24ecf7944892994e5 (diff) | |
| download | cuttlefish-cdf774ff92252cf78067f53343a17c47976b3edc.tar.gz | |
Merge "Install consumerir HAL APEX" into main am: ed0f1aa734
Original change: https://android-review.googlesource.com/c/device/google/cuttlefish/+/2753487
Change-Id: I32f3f1989d5f2600a7dbda8ebee0b17bd9a37691
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | guest/hals/ir/Android.bp | 30 | ||||
| -rw-r--r-- | shared/consumerir/device_vendor.mk | 9 |
2 files changed, 36 insertions, 3 deletions
diff --git a/guest/hals/ir/Android.bp b/guest/hals/ir/Android.bp new file mode 100644 index 000000000..dce897039 --- /dev/null +++ b/guest/hals/ir/Android.bp @@ -0,0 +1,30 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package { + default_applicable_licenses: ["Android-Apache-2.0"], +} + +apex { + name: "com.google.cf.ir", + defaults: ["com.android.hardware.ir"], + key: "com.google.cf.apex.key", + certificate: ":com.google.cf.apex.certificate", + + // Add the legacy default implementation + native_shared_libs: [ + "consumerir.default", + ], +} diff --git a/shared/consumerir/device_vendor.mk b/shared/consumerir/device_vendor.mk index 7fc8250d3..7dc937362 100644 --- a/shared/consumerir/device_vendor.mk +++ b/shared/consumerir/device_vendor.mk @@ -14,9 +14,12 @@ # limitations under the License. # -PRODUCT_COPY_FILES += \ - frameworks/native/data/etc/android.hardware.consumerir.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.consumerir.xml - +# TODO(b/302088370) remove the condition when libapexsupport is available +ifeq ($(RELEASE_AIDL_USE_UNFROZEN),true) +PRODUCT_PACKAGES += \ + com.google.cf.ir +else PRODUCT_PACKAGES += \ android.hardware.ir-service.example \ consumerir.default +endif # RELEASE_AIDL_USE_UNFROZEN |