From 8a68859bef0380643222755fb54ffff52e5aa32c Mon Sep 17 00:00:00 2001 From: Devin Moore Date: Mon, 13 Nov 2023 22:29:32 +0000 Subject: [PATCH 1/2] Reapply "Remove android.hidl.memory library from the VNDK" This reverts commit 0b69afa33891cb6be1cc1435a5a3b479d3328701. Test: m Bug: 205764958 Bug: 310700278 Bug: 310680652 Change-Id: I3cbae50922fcc230f402f68732faf50ed5683f25 --- target/product/gsi/current.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/target/product/gsi/current.txt b/target/product/gsi/current.txt index 9ff886e46e..53c9e0cb65 100644 --- a/target/product/gsi/current.txt +++ b/target/product/gsi/current.txt @@ -34,7 +34,6 @@ 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 From 49d8ce39e66b0a85e5fe944b44e332ae18490641 Mon Sep 17 00:00:00 2001 From: Devin Moore Date: Mon, 13 Nov 2023 22:32:33 +0000 Subject: [PATCH 2/2] Reapply "Stop including android.hidl.memory ashmem impl on V+ devices" This reverts commit 77393ba39d1e9030c7ecd90783b06a2e9a78d9ee. Test: m && launch_cvd && adb shell ls /vendor/lib64/hw Bug: 205764958 Bug: 310700278 Bug: 310680652 Change-Id: Ie631c666b42fbb4dc30ffd141dc8a7dbb62b2a51 --- target/product/base_system.mk | 8 +++++++- target/product/base_vendor.mk | 5 ++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/target/product/base_system.mk b/target/product/base_system.mk index e3ebaa351f..007d6c6db5 100644 --- a/target/product/base_system.mk +++ b/target/product/base_system.mk @@ -21,7 +21,6 @@ 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 \ @@ -315,6 +314,13 @@ 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 8d5b7bfbdb..a0c5929d85 100644 --- a/target/product/base_vendor.mk +++ b/target/product/base_vendor.mk @@ -46,7 +46,6 @@ 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 \ @@ -75,6 +74,10 @@ 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)