Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8faa4a58 authored by Devin Moore's avatar Devin Moore Committed by Gerrit Code Review
Browse files

Merge changes from topic "reland_hidl_mapper_removal" into main 

* changes:
  Reapply "Stop including android.hidl.memory ashmem impl on V+ devices"
  Reapply "Remove android.hidl.memory library from the VNDK"
parents 6b5e7663 49d8ce39

target/product/base_system.mk

+7 −1
Original line number Original line Diff line number Diff line
@@ -21,7 +21,6 @@ PRODUCT_PACKAGES += \ 
    am \

    am \

    android.hidl.base-V1.0-java \

    android.hidl.base-V1.0-java \

    android.hidl.manager-V1.0-java \

    android.hidl.manager-V1.0-java \

    android.hidl.memory@1.0-impl \

    android.system.suspend-service \

    android.system.suspend-service \

    android.test.base \

    android.test.base \

    android.test.mock \

    android.test.mock \
@@ -314,6 +313,13 @@ PRODUCT_PACKAGES += \ 
HIDL_SUPPORT_SERVICES := \

HIDL_SUPPORT_SERVICES := \

    hwservicemanager \

    hwservicemanager \

    android.hidl.allocator@1.0-service \

    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

# Base modules when shipping api level is less than or equal to 34

PRODUCT_PACKAGES_SHIPPING_API_LEVEL_34 += \

PRODUCT_PACKAGES_SHIPPING_API_LEVEL_34 += \

target/product/base_vendor.mk

+4 −1
Original line number Original line Diff line number Diff line
@@ -46,7 +46,6 @@ PRODUCT_HOST_PACKAGES += \ 




# Base modules and settings for the vendor partition.

# Base modules and settings for the vendor partition.

PRODUCT_PACKAGES += \

PRODUCT_PACKAGES += \

    android.hidl.memory@1.0-impl.vendor \

    com.android.hardware.cas \

    com.android.hardware.cas \

    boringssl_self_test_vendor \

    boringssl_self_test_vendor \

    dumpsys_vendor \

    dumpsys_vendor \
@@ -75,6 +74,10 @@ PRODUCT_PACKAGES += \ 
    selinux_policy_nonsystem \

    selinux_policy_nonsystem \

    shell_and_utilities_vendor \

    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

# OMX not supported for 64bit_only builds

# Only supported when SHIPPING_API_LEVEL is less than or equal to 33

# Only supported when SHIPPING_API_LEVEL is less than or equal to 33

ifneq ($(TARGET_SUPPORTS_OMX_SERVICE),false)

ifneq ($(TARGET_SUPPORTS_OMX_SERVICE),false)

target/product/gsi/current.txt

+0 −1
Original line number Original line Diff line number Diff line
@@ -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.graphics.mapper@4.0.so

VNDK-SP: android.hardware.renderscript@1.0.so

VNDK-SP: android.hardware.renderscript@1.0.so

VNDK-SP: android.hidl.memory.token@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.memory@1.0.so

VNDK-SP: android.hidl.safe_union@1.0.so

VNDK-SP: android.hidl.safe_union@1.0.so

VNDK-SP: libRSCpuRef.so

VNDK-SP: libRSCpuRef.so