Add init_second_stage.recovery to base modules.

It was previously being included as a REQUIRED module of
the init module, but including it separately allows
separating the system and recovery artifacts in different
mk files.

Remove the whitelist entries the previous construct
necessitated.

Bug: 112318375
Test: lunch mainline_arm64 && m nothing
Change-Id: I02d9ac73c65ba58bb2acc7b2046b06b58c723ced
This commit is contained in:
Anton Hansson 2018-08-14 14:06:39 +01:00
parent b05a4f1ed3
commit b8a6a476c6
2 changed files with 1 additions and 15 deletions

View File

@ -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 \

View File

@ -27,21 +27,6 @@ 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 \
ifeq ($(PRODUCT_USE_FASTBOOTD), true)
_base_mk_whitelist += \