Merge "Add power@1.3 to the VNDK."
diff --git a/core/config.mk b/core/config.mk
index 9f872a2..b5ae2d5 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -863,11 +863,6 @@
ifdef PRODUCT_SHIPPING_API_LEVEL
- ifneq ($(call math_gt_or_eq,$(PRODUCT_SHIPPING_API_LEVEL),27),)
- ifneq ($(TARGET_USES_MKE2FS),true)
- $(error When PRODUCT_SHIPPING_API_LEVEL >= 27, TARGET_USES_MKE2FS must be true)
- endif
- endif
ifneq ($(call numbers_less_than,$(PRODUCT_SHIPPING_API_LEVEL),$(BOARD_SYSTEMSDK_VERSIONS)),)
$(error BOARD_SYSTEMSDK_VERSIONS ($(BOARD_SYSTEMSDK_VERSIONS)) must all be greater than or equal to PRODUCT_SHIPPING_API_LEVEL ($(PRODUCT_SHIPPING_API_LEVEL)))
endif
diff --git a/target/board/BoardConfigGsiCommon.mk b/target/board/BoardConfigGsiCommon.mk
index 47107a0..c1f3627 100644
--- a/target/board/BoardConfigGsiCommon.mk
+++ b/target/board/BoardConfigGsiCommon.mk
@@ -9,7 +9,6 @@
# Some vendors' bootloaders don't work properly with raw format images. So
# we explicit specify this need below (even though it's the current default).
TARGET_USERIMAGES_SPARSE_EXT_DISABLED := false
-TARGET_USES_MKE2FS := true
# Enable dyanmic system image size and reserved 64MB in it.
BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE := 67108864
diff --git a/target/board/treble_common.mk b/target/board/treble_common.mk
index 7da7b30..e314eba 100644
--- a/target/board/treble_common.mk
+++ b/target/board/treble_common.mk
@@ -34,7 +34,6 @@
TARGET_USERIMAGES_USE_EXT4 := true
TARGET_USERIMAGES_USE_F2FS := true
TARGET_USERIMAGES_SPARSE_EXT_DISABLED := false
-TARGET_USES_MKE2FS := true
# Enable dyanmic system image size and reserved 64MB in it.
BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE := 67108864
diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index 27f5e18..c2ea1de 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -256,6 +256,11 @@
framework_manifest.xml \
framework_compatibility_matrix.xml \
+ifeq ($(PRODUCT_USE_FASTBOOTD), true)
+PRODUCT_PACKAGES += \
+ fastbootd
+endif
+
ifeq ($(TARGET_CORE_JARS),)
$(error TARGET_CORE_JARS is empty; cannot initialize PRODUCT_BOOT_JARS variable)
endif
diff --git a/target/product/base_vendor.mk b/target/product/base_vendor.mk
index 6ff271d..c0728d8 100644
--- a/target/product/base_vendor.mk
+++ b/target/product/base_vendor.mk
@@ -17,6 +17,7 @@
# Base modules and settings for recovery.
PRODUCT_PACKAGES += \
adbd.recovery \
+ android.hardware.health@2.0-impl-default.recovery \
ld.config.recovery.txt \
linker.recovery \
recovery \
diff --git a/target/product/mainline_system.mk b/target/product/mainline_system.mk
index 74a3b19..2854d54 100644
--- a/target/product/mainline_system.mk
+++ b/target/product/mainline_system.mk
@@ -43,6 +43,33 @@
recovery/root/system/lib64/libselinux.so \
recovery/root/system/lib64/libz.so \
+ifeq ($(PRODUCT_USE_FASTBOOTD), true)
+ _base_mk_whitelist += \
+ recovery/root/system/bin/fastbootd \
+ recovery/root/system/lib64/android.hardware.boot@1.0.so \
+ recovery/root/system/lib64/hw/bootctrl.default.so \
+ recovery/root/system/lib64/libadbd.so \
+ recovery/root/system/lib64/libadbd_services.so \
+ recovery/root/system/lib64/libasyncio.so \
+ recovery/root/system/lib64/libbootloader_message.so \
+ recovery/root/system/lib64/libcrypto_utils.so \
+ recovery/root/system/lib64/libext2_uuid.so \
+ recovery/root/system/lib64/libext4_utils.so \
+ recovery/root/system/lib64/libfec.so \
+ recovery/root/system/lib64/libfec_rs.so \
+ recovery/root/system/lib64/libfs_mgr.so \
+ recovery/root/system/lib64/libhidlbase.so \
+ recovery/root/system/lib64/libhidltransport.so \
+ recovery/root/system/lib64/libhwbinder.so \
+ recovery/root/system/lib64/libkeyutils.so \
+ recovery/root/system/lib64/liblogwrap.so \
+ recovery/root/system/lib64/liblp.so \
+ recovery/root/system/lib64/libmdnssd.so \
+ recovery/root/system/lib64/libsparse.so \
+ recovery/root/system/lib64/libsquashfs_utils.so \
+ recovery/root/system/lib64/libutils.so
+endif
+
_my_whitelist := $(_base_mk_whitelist)
# Both /system and / are in system.img when PRODUCT_SHIPPING_API_LEVEL>=28.