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

Commit 64c25595 authored by Devin Moore's avatar Devin Moore
Browse files

Remove hwservicemanager and hidl allocator. 

...from devices launching after Android V.

Devices can add them back in explicitly now that they are also moved to
system_ext.

Test: m
Bug: 218588089
Change-Id: Ib3c917896c7a9b2c5940922c9faddb44cc7a0766
parent c269ec35

core/product.mk

+7 −0
Original line number Diff line number Diff line
@@ -43,6 +43,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 \
@@ -109,7 +108,6 @@ PRODUCT_PACKAGES += \ 
    gatekeeperd \

    gpuservice \

    hid \

    hwservicemanager \

    idmap2 \

    idmap2d \

    ime \
@@ -302,6 +300,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 \