commit cb0e97750a1fc244e9f035f1a555ff00f2ddeaf8
author Yifan Hong <elsk@google.com> Fri Jan 24 22:39:41 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jan 24 22:39:41 2020 +0000
tree d0dc323ebe2f093ab0062b7ac9af372237d6f616
parent 7ad254aee94f30510fd31b03ff8ac23409630114
parent 04d4c089290b90371c3f35ead809bf547f7ef32a

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.

core/soong_config.mk

diff --git a/core/soong_config.mk b/core/soong_config.mk
index 7c58082..d223792 100644
--- a/core/soong_config.mk
+++ b/core/soong_config.mk
@@ -203,6 +203,8 @@
 
 $(call add_json_bool, InstallExtraFlattenedApexes, $(PRODUCT_INSTALL_EXTRA_FLATTENED_APEXES))
 
+$(call add_json_bool, BoardUsesRecoveryAsBoot, $(BOARD_USES_RECOVERY_AS_BOOT))
+
 $(call json_end)
 
 $(file >$(SOONG_VARIABLES).tmp,$(json_contents))

target/product/virtual_ab_ota.mk

diff --git a/target/product/virtual_ab_ota.mk b/target/product/virtual_ab_ota.mk
index c00b0ed..5c398b4 100644
--- a/target/product/virtual_ab_ota.mk
+++ b/target/product/virtual_ab_ota.mk
@@ -17,3 +17,5 @@
 PRODUCT_VIRTUAL_AB_OTA := true
 
 PRODUCT_PRODUCT_PROPERTIES += ro.virtual_ab.enabled=true
+
+PRODUCT_PACKAGES += e2fsck_ramdisk