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

Stop including android.hidl.memory ashmem impl on V+ devices

Browse Source 
We no longer support HIDL in devices targeting Android V+ vendor.

Test: m && launch_cvd && adb shell ls /vendor/lib64/hw
Bug: 205764958
Change-Id: I6c528be1ae2bf34c790ab2efc83ce7a8db8c9770
This commit is contained in:
Devin Moore
2023-11-06 23:57:46 +00:00
parent 4859a6a250
commit 3ae48f2e66
2 changed files with 11 additions and 2 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 \ 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 \
@@ -315,6 +314,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 += \

5
target/product/base_vendor.mk
View File

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