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

Merge changes from topic "revert-2818339-remove_hidl_memory-VHKFNXVYFO" into main am: 731d920878 am: a700ffcb1c

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/2828479

Change-Id: I6cb1c992d26c748e8a6ca6d4fd8a72431f79b6b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Devin Moore
2023-11-13 22:26:44 +00:00
committed by Automerger Merge Worker
parent 7c73e9ef3b a700ffcb1c
commit 59e44874c5
3 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
target/product/base_system.mk
View File

@@ -21,6 +21,7 @@ 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,13 +315,6 @@ 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,6 +46,7 @@ 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 \
@@ -74,10 +75,6 @@ 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)

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

@@ -34,6 +34,7 @@ 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