From 03989a88a646f623d6cd16cdb0b31faccd84f907 Mon Sep 17 00:00:00 2001 From: Aaron Kling Date: Mon, 18 Apr 2022 21:00:38 -0500 Subject: [PATCH] Fix copying sepolicy on devices without a vendor partition Current flow creates a vendor folder in the recovery ramdisk, then the build fails when the ramdisk rule tries to create a symlink there. Change-Id: I8bfb77d829c5dc6fcb2701cbfe44ce104058f37f --- prebuilt/Android.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/prebuilt/Android.mk b/prebuilt/Android.mk index 82849438..7a729189 100755 --- a/prebuilt/Android.mk +++ b/prebuilt/Android.mk @@ -392,11 +392,11 @@ 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/ && \ - mkdir -p $(TARGET_RECOVERY_ROOT_OUT)/vendor/etc/selinux/ && \ + mkdir -p $(TARGET_RECOVERY_ROOT_OUT)/$(TARGET_COPY_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 + cp $(TARGET_OUT_VENDOR_ETC)/selinux/vndservice_contexts $(TARGET_RECOVERY_ROOT_OUT)/$(TARGET_COPY_OUT_VENDOR)/etc/selinux/vndservice_contexts && \ + cp $(TARGET_OUT_VENDOR_ETC)/selinux/vendor_hwservice_contexts $(TARGET_RECOVERY_ROOT_OUT)/$(TARGET_COPY_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