Merge "Remove snapuserd from vendor ramdisk" am: 4f3937ac74
am: a0041bba5e
Original change: https://android-review.googlesource.com/c/platform/build/+/2042523 Change-Id: Ice3ba8bfbcb70da58b45f6bca75be32d9a135e23 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -37,5 +37,16 @@ PRODUCT_VIRTUAL_AB_COMPRESSION := true
|
||||
PRODUCT_VIRTUAL_AB_COMPRESSION_METHOD ?= none
|
||||
PRODUCT_PACKAGES += \
|
||||
snapuserd \
|
||||
snapuserd.recovery \
|
||||
|
||||
# For dedicated recovery partitions, we need to include snapuserd
|
||||
# For GKI devices, BOARD_USES_RECOVERY_AS_BOOT is empty, but
|
||||
# so is BOARD_MOVE_RECOVERY_RESOURCES_TO_VENDOR_BOOT.
|
||||
ifdef BUILDING_RECOVERY_IMAGE
|
||||
ifneq ($(BOARD_USES_RECOVERY_AS_BOOT),true)
|
||||
ifneq ($(BOARD_MOVE_RECOVERY_RESOURCES_TO_VENDOR_BOOT),true)
|
||||
PRODUCT_PACKAGES += \
|
||||
snapuserd.recovery
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
|
||||
|
Reference in New Issue
Block a user