commit 3d128b88f0242a12cbfa96dac4fdb5aa74cf50d6
author Anton Hansson <hansson@google.com> Thu Aug 16 06:48:50 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Aug 16 06:48:50 2018 +0000
tree 708ccf464c0afd7343ea7595c74da54a2ab493db
parent a5985593c4431044280f1cbfd2e74557eb6a5a7f
parent b8a6a476c63e871a1a6776dd850b66c4b7fd511a

Merge "Add init_second_stage.recovery to base modules."

target/product/base_vendor.mk

diff --git a/target/product/base_vendor.mk b/target/product/base_vendor.mk
index c0728d8..28a04d6 100644
--- a/target/product/base_vendor.mk
+++ b/target/product/base_vendor.mk
@@ -18,6 +18,7 @@
 PRODUCT_PACKAGES += \
     adbd.recovery \
     android.hardware.health@2.0-impl-default.recovery \
+    init_second_stage.recovery \
     ld.config.recovery.txt \
     linker.recovery \
     recovery \

target/product/mainline_system.mk

diff --git a/target/product/mainline_system.mk b/target/product/mainline_system.mk
index 2854d54..274b2c8 100644
--- a/target/product/mainline_system.mk
+++ b/target/product/mainline_system.mk
@@ -27,21 +27,6 @@
 
 _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 \
 
 ifeq ($(PRODUCT_USE_FASTBOOTD), true)
   _base_mk_whitelist += \