tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove hwservicemanager and hidl allocator. am: 64c2559577

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

Change-Id: I250e776c31413097c7c5438db36be890bcdd0881
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Devin Moore 2023-08-31 16:22:41 +00:00 committed by Automerger Merge Worker
commit 278aea5ba4
3 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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_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

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

10
target/product/base_system.mk
View file

@ -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 \
@ -111,7 +110,6 @@ PRODUCT_PACKAGES += \
gatekeeperd \
gpuservice \
hid \
hwservicemanager \
idmap2 \
idmap2d \
ime \
@ -312,6 +310,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 \