From 4432915152e6e0f68bd21806c102827466860bd7 Mon Sep 17 00:00:00 2001 From: Aayush Gupta Date: Thu, 22 Oct 2020 13:02:38 +0530 Subject: [PATCH] sepolicy_vndr: Switch to BOARD_VENDOR_SEPOLICY_DIRS - BOARD_SEPOLICY_DIRS is deprecated and gives compile-time errors when used in unison with a device using BOARD_VENDOR_SEPOLICY_DIRS Ref: [0]: https://github.com/LineageOS/android_system_sepolicy/commit/ec3ac470a98342c13c1fec8d46433c73b08531be Signed-off-by: Aayush Gupta Change-Id: Icefb062cc8cdef532b4310684d9a66afe97e49c4 --- SEPolicy.mk | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/SEPolicy.mk b/SEPolicy.mk index 79af5e63..e57123ec 100644 --- a/SEPolicy.mk +++ b/SEPolicy.mk @@ -35,8 +35,8 @@ PRODUCT_PRIVATE_SEPOLICY_DIRS := \ $(QSSI_SEPOLICY_PATH)/qva/product/private ifeq (,$(filter sdm845 sdm710, $(TARGET_BOARD_PLATFORM))) - BOARD_SEPOLICY_DIRS := \ - $(BOARD_SEPOLICY_DIRS) \ + BOARD_VENDOR_SEPOLICY_DIRS := \ + $(BOARD_VENDOR_SEPOLICY_DIRS) \ $(SEPOLICY_PATH) \ $(SEPOLICY_PATH)/generic/vendor/common \ $(SEPOLICY_PATH)/generic/vendor/common/attribute \ @@ -44,16 +44,16 @@ ifeq (,$(filter sdm845 sdm710, $(TARGET_BOARD_PLATFORM))) $(SEPOLICY_PATH)/qva/vendor/common ifeq ($(TARGET_SEPOLICY_DIR),) - BOARD_SEPOLICY_DIRS += $(SEPOLICY_PATH)/generic/vendor/$(TARGET_BOARD_PLATFORM) - BOARD_SEPOLICY_DIRS += $(SEPOLICY_PATH)/qva/vendor/$(TARGET_BOARD_PLATFORM) + BOARD_VENDOR_SEPOLICY_DIRS += $(SEPOLICY_PATH)/generic/vendor/$(TARGET_BOARD_PLATFORM) + BOARD_VENDOR_SEPOLICY_DIRS += $(SEPOLICY_PATH)/qva/vendor/$(TARGET_BOARD_PLATFORM) else - BOARD_SEPOLICY_DIRS += $(SEPOLICY_PATH)/generic/vendor/$(TARGET_SEPOLICY_DIR) - BOARD_SEPOLICY_DIRS += $(SEPOLICY_PATH)/qva/vendor/$(TARGET_SEPOLICY_DIR) + BOARD_VENDOR_SEPOLICY_DIRS += $(SEPOLICY_PATH)/generic/vendor/$(TARGET_SEPOLICY_DIR) + BOARD_VENDOR_SEPOLICY_DIRS += $(SEPOLICY_PATH)/qva/vendor/$(TARGET_SEPOLICY_DIR) endif ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) - BOARD_SEPOLICY_DIRS += $(SEPOLICY_PATH)/generic/vendor/test - BOARD_SEPOLICY_DIRS += $(SEPOLICY_PATH)/qva/vendor/test - BOARD_SEPOLICY_DIRS += $(SEPOLICY_PATH)/qva/vendor/test/sysmonapp + BOARD_VENDOR_SEPOLICY_DIRS += $(SEPOLICY_PATH)/generic/vendor/test + BOARD_VENDOR_SEPOLICY_DIRS += $(SEPOLICY_PATH)/qva/vendor/test + BOARD_VENDOR_SEPOLICY_DIRS += $(SEPOLICY_PATH)/qva/vendor/test/sysmonapp endif endif