Merge "Add soong_droiddoc_prebuilt.mk"
diff --git a/target/product/full.mk b/target/product/full.mk
index 7c0578c..b356f9d 100644
--- a/target/product/full.mk
+++ b/target/product/full.mk
@@ -23,6 +23,9 @@
 $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk)
 $(call inherit-product, $(SRC_TARGET_DIR)/board/generic/device.mk)
 
+# Enable dynamic partition size
+PRODUCT_USE_DYNAMIC_PARTITION_SIZE := true
+
 # Overrides
 PRODUCT_NAME := full
 PRODUCT_DEVICE := generic
diff --git a/target/product/full_x86.mk b/target/product/full_x86.mk
index 6ea2d05..a76b07c 100644
--- a/target/product/full_x86.mk
+++ b/target/product/full_x86.mk
@@ -36,6 +36,9 @@
 	bios.bin \
 	vgabios-cirrus.bin \
 
+# Enable dynamic partition size
+PRODUCT_USE_DYNAMIC_PARTITION_SIZE := true
+
 # Overrides
 PRODUCT_NAME := full_x86
 PRODUCT_DEVICE := generic_x86
diff --git a/target/product/mainline_system.mk b/target/product/mainline_system.mk
index da6a742..74a3b19 100644
--- a/target/product/mainline_system.mk
+++ b/target/product/mainline_system.mk
@@ -18,12 +18,30 @@
 # device with no telephony.
 $(call inherit-product, $(SRC_TARGET_DIR)/product/handheld_system.mk)
 
+# Enable dynamic partition size
+PRODUCT_USE_DYNAMIC_PARTITION_SIZE := true
+
 PRODUCT_NAME := mainline_system
 PRODUCT_BRAND := generic
 PRODUCT_SHIPPING_API_LEVEL := 28
 
 _base_mk_whitelist := \
   recovery/root/etc/mke2fs.conf \
+  recovery/root/system/bin/init \
+  recovery/root/system/bin/ueventd \
+  recovery/root/system/lib64/ld-android.so \
+  recovery/root/system/lib64/libbase.so \
+  recovery/root/system/lib64/libc++.so \
+  recovery/root/system/lib64/libc.so \
+  recovery/root/system/lib64/libcrypto.so \
+  recovery/root/system/lib64/libcutils.so \
+  recovery/root/system/lib64/libdl.so \
+  recovery/root/system/lib64/liblog.so \
+  recovery/root/system/lib64/libm.so \
+  recovery/root/system/lib64/libpackagelistparser.so \
+  recovery/root/system/lib64/libpcre2.so \
+  recovery/root/system/lib64/libselinux.so \
+  recovery/root/system/lib64/libz.so \
 
 _my_whitelist := $(_base_mk_whitelist)