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
This commit is contained in:
Devin Moore
2023-11-13 19:32:46 +00:00
committed by Gerrit Code Review
parent 3ae48f2e66
commit 77393ba39d
2 changed files with 2 additions and 11 deletions

View File

@@ -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 += \

View File

@@ -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)