From 8bd1ac5f7c02512f1c33fd29ae61417fdb99c882 Mon Sep 17 00:00:00 2001 From: Captain Throwback Date: Mon, 19 Oct 2020 13:09:17 -0400 Subject: [PATCH] mke2fs: add conf file to recovery build if flag is set Also clean up paths for some other files in Android.mk Change-Id: I31220642e8396c6360c11078959796c045f53b9e --- prebuilt/Android.mk | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/prebuilt/Android.mk b/prebuilt/Android.mk index 45816f31..09bdb7a5 100755 --- a/prebuilt/Android.mk +++ b/prebuilt/Android.mk @@ -348,10 +348,15 @@ LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT) LOCAL_POST_INSTALL_CMD += \ mkdir -p $(TARGET_RECOVERY_ROOT_OUT)/sbin; ln -sf /system/bin/sh $(TARGET_RECOVERY_ROOT_OUT)/sbin/sh && \ mkdir -p $(TARGET_RECOVERY_ROOT_OUT)/system/etc/selinux/ && \ - cp $(TARGET_ROOT_OUT)/../system/etc/selinux/plat_service_contexts $(TARGET_RECOVERY_ROOT_OUT)/system/etc/selinux/plat_service_contexts && \ - cp $(TARGET_ROOT_OUT)/../system/etc/selinux/plat_hwservice_contexts $(TARGET_RECOVERY_ROOT_OUT)/system/etc/selinux/plat_hwservice_contexts && \ - cp $(TARGET_ROOT_OUT)/../vendor/etc/selinux/vndservice_contexts $(TARGET_RECOVERY_ROOT_OUT)/system/etc/selinux/vndservice_contexts && \ - cp $(TARGET_ROOT_OUT)/../vendor/etc/selinux/vendor_hwservice_contexts $(TARGET_RECOVERY_ROOT_OUT)/system/etc/selinux/vendor_hwservice_contexts + mkdir -p $(TARGET_RECOVERY_ROOT_OUT)/vendor/etc/selinux/ && \ + cp $(TARGET_OUT_ETC)/selinux/plat_service_contexts $(TARGET_RECOVERY_ROOT_OUT)/system/etc/selinux/plat_service_contexts && \ + cp $(TARGET_OUT_ETC)/selinux/plat_hwservice_contexts $(TARGET_RECOVERY_ROOT_OUT)/system/etc/selinux/plat_hwservice_contexts && \ + cp $(TARGET_OUT_VENDOR_ETC)/selinux/vndservice_contexts $(TARGET_RECOVERY_ROOT_OUT)/vendor/etc/selinux/vndservice_contexts && \ + cp $(TARGET_OUT_VENDOR_ETC)/selinux/vendor_hwservice_contexts $(TARGET_RECOVERY_ROOT_OUT)/vendor/etc/selinux/vendor_hwservice_contexts + ifeq ($(TARGET_USES_MKE2FS), true) + LOCAL_POST_INSTALL_CMD += \ + && cp $(TARGET_OUT_ETC)/mke2fs.conf $(TARGET_RECOVERY_ROOT_OUT)/system/etc/mke2fs.conf + endif LOCAL_REQUIRED_MODULES += init_second_stage.recovery reboot.recovery plat_service_contexts plat_hardware_contexts vndservice_contexts include $(BUILD_PHONY_PACKAGE)