Merge cherrypicks of [16510410] into tm-release.

Change-Id: I369132299ccf18ce137f42b6750d81f6017def32
This commit is contained in:
Android Build Coastguard Worker 2021-12-20 18:03:19 +00:00
commit 16ab2de52f

View file

@ -99,9 +99,6 @@ endif
ifneq ($(PRODUCT_BUILD_VBMETA_IMAGE),false) ifneq ($(PRODUCT_BUILD_VBMETA_IMAGE),false)
AB_OTA_PARTITIONS += vbmeta AB_OTA_PARTITIONS += vbmeta
endif endif
ifneq ($(PRODUCT_BUILD_PVMFW_IMAGE),false)
AB_OTA_PARTITIONS += pvmfw
endif
# EMULATOR common modules # EMULATOR common modules
BOARD_EMULATOR_COMMON_MODULES := liblight BOARD_EMULATOR_COMMON_MODULES := liblight