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

Merge changes from topic "no_hidl_support" into main

Browse Source 
* changes:
  Add symlink to hwservicemanager
  Remove hwservicemanager and hidl allocator.
This commit is contained in:
Devin Moore
2023-08-31 15:51:14 +00:00
committed by Gerrit Code Review
parent c20ef7ca4a 7083a1c98e
commit 01e56d0ae0
4 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/Makefile
View File

@@ -3329,6 +3329,12 @@ ifdef BOARD_USES_SYSTEM_EXTIMAGE
ALL_DEFAULT_INSTALLED_MODULES += $(_systemext_symlink) ALL_DEFAULT_INSTALLED_MODULES += $(_systemext_symlink)
endif endif
# Create symlink /system/bin/hwservicemanager -> /system/system_ext/bin/hwservicemanager
# Old vendor libraries (like libhidlbase) may require /system/bin/hwservicemanager to be present
$(call symlink-file,$(TARGET_OUT_SYSTEM_EXT)/bin/hwservicemanager,/system/system_ext/bin/hwservicemanager, $(TARGET_OUT)/bin/hwservicemanager)
INTERNAL_SYSTEMIMAGE_FILES += \
$(TARGET_OUT)/bin/hwservicemanager
# ----------------------------------------------------------------- # -----------------------------------------------------------------
# system_dlkm partition image # system_dlkm partition image

7
core/product.mk
View File

@@ -47,6 +47,13 @@ _product_list_vars += PRODUCT_PACKAGES
_product_list_vars += PRODUCT_PACKAGES_DEBUG _product_list_vars += PRODUCT_PACKAGES_DEBUG
_product_list_vars += PRODUCT_PACKAGES_DEBUG_ASAN _product_list_vars += PRODUCT_PACKAGES_DEBUG_ASAN
_product_list_vars += PRODUCT_PACKAGES_ARM64 _product_list_vars += PRODUCT_PACKAGES_ARM64
# packages that are added to PRODUCT_PACKAGES based on the PRODUCT_SHIPPING_API_LEVEL
# These are only added if the shipping API level is that level or lower
_product_list_vars += PRODUCT_PACKAGES_SHIPPING_API_LEVEL_29
_product_list_vars += PRODUCT_PACKAGES_SHIPPING_API_LEVEL_33
_product_list_vars += PRODUCT_PACKAGES_SHIPPING_API_LEVEL_34
# Packages included only for eng/userdebug builds, when building with EMMA_INSTRUMENT=true # Packages included only for eng/userdebug builds, when building with EMMA_INSTRUMENT=true
_product_list_vars += PRODUCT_PACKAGES_DEBUG_JAVA_COVERAGE _product_list_vars += PRODUCT_PACKAGES_DEBUG_JAVA_COVERAGE
_product_list_vars += PRODUCT_PACKAGES_ENG _product_list_vars += PRODUCT_PACKAGES_ENG

3
core/product_config.mk
View File

@@ -500,6 +500,9 @@ ifdef PRODUCT_SHIPPING_API_LEVEL
ifneq (,$(call math_gt_or_eq,33,$(PRODUCT_SHIPPING_API_LEVEL))) ifneq (,$(call math_gt_or_eq,33,$(PRODUCT_SHIPPING_API_LEVEL)))
PRODUCT_PACKAGES += $(PRODUCT_PACKAGES_SHIPPING_API_LEVEL_33) PRODUCT_PACKAGES += $(PRODUCT_PACKAGES_SHIPPING_API_LEVEL_33)
endif endif
ifneq (,$(call math_gt_or_eq,34,$(PRODUCT_SHIPPING_API_LEVEL)))
PRODUCT_PACKAGES += $(PRODUCT_PACKAGES_SHIPPING_API_LEVEL_34)
endif
endif endif
# If build command defines OVERRIDE_PRODUCT_EXTRA_VNDK_VERSIONS, # If build command defines OVERRIDE_PRODUCT_EXTRA_VNDK_VERSIONS,

10
target/product/base_system.mk
View File

@@ -19,7 +19,6 @@ PRODUCT_PACKAGES += \
abx \ abx \
adbd_system_api \ adbd_system_api \
am \ am \
android.hidl.allocator@1.0-service \
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.hidl.memory@1.0-impl \
@@ -108,7 +107,6 @@ PRODUCT_PACKAGES += \
gatekeeperd \ gatekeeperd \
gpuservice \ gpuservice \
hid \ hid \
hwservicemanager \
idmap2 \ idmap2 \
idmap2d \ idmap2d \
ime \ ime \
@@ -308,6 +306,14 @@ PRODUCT_PACKAGES += \
system_manifest.xml \ system_manifest.xml \
system_compatibility_matrix.xml \ system_compatibility_matrix.xml \
HIDL_SUPPORT_SERVICES := \
hwservicemanager \
android.hidl.allocator@1.0-service \
# Base modules when shipping api level is less than or equal to 34
PRODUCT_PACKAGES_SHIPPING_API_LEVEL_34 += \
$(HIDL_SUPPORT_SERVICES) \
PRODUCT_PACKAGES_ARM64 := libclang_rt.hwasan \ PRODUCT_PACKAGES_ARM64 := libclang_rt.hwasan \
libclang_rt.hwasan.bootstrap \ libclang_rt.hwasan.bootstrap \
libc_hwasan \ libc_hwasan \