From 77393ba39d1e9030c7ecd90783b06a2e9a78d9ee Mon Sep 17 00:00:00 2001 From: Devin Moore Date: Mon, 13 Nov 2023 19:32:46 +0000 Subject: [PATCH 1/2] Revert "Stop including android.hidl.memory ashmem impl on V+ devices" Revert submission 2818339-remove_hidl_memory Reason for revert: b/310680652 broke VTS tests Reverted changes: /q/submissionid:2818339-remove_hidl_memory Change-Id: I1065d67949c4270d5351a9ca00ec79ead845020d --- target/product/base_system.mk | 8 +------- target/product/base_vendor.mk | 5 +---- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/target/product/base_system.mk b/target/product/base_system.mk index 1510ab111b..fd4318f99e 100644 --- a/target/product/base_system.mk +++ b/target/product/base_system.mk @@ -21,6 +21,7 @@ PRODUCT_PACKAGES += \ am \ android.hidl.base-V1.0-java \ android.hidl.manager-V1.0-java \ + android.hidl.memory@1.0-impl \ android.system.suspend-service \ android.test.base \ android.test.mock \ @@ -314,13 +315,6 @@ PRODUCT_PACKAGES += \ HIDL_SUPPORT_SERVICES := \ hwservicemanager \ android.hidl.allocator@1.0-service \ - android.hidl.memory@1.0-impl \ - -# TODO(b/299166571) Remove this after the artifact path requirements checker picks up -# this library correctly with the *SHIPPING_API_LEVEL_34 variable -PRODUCT_ARTIFACT_PATH_REQUIREMENT_ALLOWED_LIST += \ - $(TARGET_COPY_OUT_SYSTEM)/lib/hw/android.hidl.memory@1.0-impl.so \ - $(TARGET_COPY_OUT_SYSTEM)/lib64/hw/android.hidl.memory@1.0-impl.so \ # Base modules when shipping api level is less than or equal to 34 PRODUCT_PACKAGES_SHIPPING_API_LEVEL_34 += \ diff --git a/target/product/base_vendor.mk b/target/product/base_vendor.mk index a0c5929d85..8d5b7bfbdb 100644 --- a/target/product/base_vendor.mk +++ b/target/product/base_vendor.mk @@ -46,6 +46,7 @@ PRODUCT_HOST_PACKAGES += \ # Base modules and settings for the vendor partition. PRODUCT_PACKAGES += \ + android.hidl.memory@1.0-impl.vendor \ com.android.hardware.cas \ boringssl_self_test_vendor \ dumpsys_vendor \ @@ -74,10 +75,6 @@ PRODUCT_PACKAGES += \ selinux_policy_nonsystem \ shell_and_utilities_vendor \ -# Base modules when shipping api level is less than or equal to 34 -PRODUCT_PACKAGES_SHIPPING_API_LEVEL_34 += \ - android.hidl.memory@1.0-impl.vendor \ - # OMX not supported for 64bit_only builds # Only supported when SHIPPING_API_LEVEL is less than or equal to 33 ifneq ($(TARGET_SUPPORTS_OMX_SERVICE),false) From 0b69afa33891cb6be1cc1435a5a3b479d3328701 Mon Sep 17 00:00:00 2001 From: Devin Moore Date: Mon, 13 Nov 2023 19:32:46 +0000 Subject: [PATCH 2/2] Revert "Remove android.hidl.memory library from the VNDK" Revert submission 2818339-remove_hidl_memory Reason for revert: b/310680652 broke VTS tests Reverted changes: /q/submissionid:2818339-remove_hidl_memory Change-Id: Ie55fd1d0b8429a17966755ec1c54b2868ca966f9 --- target/product/gsi/current.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/target/product/gsi/current.txt b/target/product/gsi/current.txt index 53c9e0cb65..9ff886e46e 100644 --- a/target/product/gsi/current.txt +++ b/target/product/gsi/current.txt @@ -34,6 +34,7 @@ VNDK-SP: android.hardware.graphics.mapper@3.0.so VNDK-SP: android.hardware.graphics.mapper@4.0.so VNDK-SP: android.hardware.renderscript@1.0.so VNDK-SP: android.hidl.memory.token@1.0.so +VNDK-SP: android.hidl.memory@1.0-impl.so VNDK-SP: android.hidl.memory@1.0.so VNDK-SP: android.hidl.safe_union@1.0.so VNDK-SP: libRSCpuRef.so