Merge changes from topics "board_use_recovery_as_root_soong", "ramdisk"

* changes:
  Add e2fsck_ramdisk for VAB devices
  Export BOARD_USES_RECOVERY_AS_BOOT to soong.
This commit is contained in:
Yifan Hong 2020-01-24 22:39:41 +00:00 committed by Gerrit Code Review
commit cb0e97750a
2 changed files with 4 additions and 0 deletions

View file

@ -203,6 +203,8 @@ $(call add_json_bool, EnforceProductPartitionInterface, $(PRODUCT_ENFORCE_PRODU
$(call add_json_bool, InstallExtraFlattenedApexes, $(PRODUCT_INSTALL_EXTRA_FLATTENED_APEXES)) $(call add_json_bool, InstallExtraFlattenedApexes, $(PRODUCT_INSTALL_EXTRA_FLATTENED_APEXES))
$(call add_json_bool, BoardUsesRecoveryAsBoot, $(BOARD_USES_RECOVERY_AS_BOOT))
$(call json_end) $(call json_end)
$(file >$(SOONG_VARIABLES).tmp,$(json_contents)) $(file >$(SOONG_VARIABLES).tmp,$(json_contents))

View file

@ -17,3 +17,5 @@
PRODUCT_VIRTUAL_AB_OTA := true PRODUCT_VIRTUAL_AB_OTA := true
PRODUCT_PRODUCT_PROPERTIES += ro.virtual_ab.enabled=true PRODUCT_PRODUCT_PROPERTIES += ro.virtual_ab.enabled=true
PRODUCT_PACKAGES += e2fsck_ramdisk