StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topic "remove_hidl_memory" into main

Browse Source 
* changes:
  Stop including android.hidl.memory ashmem impl on V+ devices
  Remove android.hidl.memory library from the VNDK
This commit is contained in:
Devin Moore
2023-11-13 17:55:30 +00:00
committed by Gerrit Code Review
parent 70ed34cc72 3ae48f2e66
commit 001ed67bba
3 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
target/product/base_system.mk
View File

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

5
target/product/base_vendor.mk
View File

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

1
target/product/gsi/current.txt
View File

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