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

Commit 01e56d0a authored by Devin Moore's avatar Devin Moore Committed by Gerrit Code Review
Browse files

Merge changes from topic "no_hidl_support" into main 

* changes:
  Add symlink to hwservicemanager
  Remove hwservicemanager and hidl allocator.
parents c20ef7ca 7083a1c9

core/Makefile

+6 −0
Original line number Diff line number Diff line
@@ -3329,6 +3329,12 @@ ifdef BOARD_USES_SYSTEM_EXTIMAGE 
  ALL_DEFAULT_INSTALLED_MODULES += $(_systemext_symlink)

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

core/product.mk

+7 −0
Original line number Diff line number Diff line
@@ -47,6 +47,13 @@ _product_list_vars += PRODUCT_PACKAGES 
_product_list_vars += PRODUCT_PACKAGES_DEBUG

_product_list_vars += PRODUCT_PACKAGES_DEBUG_ASAN

_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

_product_list_vars += PRODUCT_PACKAGES_DEBUG_JAVA_COVERAGE

_product_list_vars += PRODUCT_PACKAGES_ENG

core/product_config.mk

+3 −0
Original line number Diff line number Diff line
@@ -500,6 +500,9 @@ ifdef PRODUCT_SHIPPING_API_LEVEL 
  ifneq (,$(call math_gt_or_eq,33,$(PRODUCT_SHIPPING_API_LEVEL)))

    PRODUCT_PACKAGES += $(PRODUCT_PACKAGES_SHIPPING_API_LEVEL_33)

  endif

  ifneq (,$(call math_gt_or_eq,34,$(PRODUCT_SHIPPING_API_LEVEL)))

    PRODUCT_PACKAGES += $(PRODUCT_PACKAGES_SHIPPING_API_LEVEL_34)

  endif

endif



# If build command defines OVERRIDE_PRODUCT_EXTRA_VNDK_VERSIONS,

target/product/base_system.mk

+8 −2
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ PRODUCT_PACKAGES += \ 
    abx \

    adbd_system_api \

    am \

    android.hidl.allocator@1.0-service \

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

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

    android.hidl.memory@1.0-impl \
@@ -108,7 +107,6 @@ PRODUCT_PACKAGES += \ 
    gatekeeperd \

    gpuservice \

    hid \

    hwservicemanager \

    idmap2 \

    idmap2d \

    ime \
@@ -308,6 +306,14 @@ PRODUCT_PACKAGES += \ 
    system_manifest.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 \

 libclang_rt.hwasan.bootstrap \

 libc_hwasan \