Android.mk: Enforce SYSTEM_EXT_* vars on API >= 31
Devices launched with S must use the new variable naming scheme introduced in If8188feb365eb9e500f2270241fa190a20e9de01 "Android.mk: Support SYSTEM_EXT* sepolicy". The old variable name `BOARD_PLAT_{PUBLIC,PRIVATE}_SEPOLICY_DIR` does no longer accurately reflect its usage and as such is deprecated. Test: `make selinux_policy` with PRODUCT_SHIPPING_API_LEVEL=26 `BOARD_PLAT_{PUBLIC,PRIVATE}_SEPOLICY_DIR}` set, observe additions in `$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/selinux` Test: `make selinux_policy` with PRODUCT_SHIPPING_API_LEVEL=31 `BOARD_PLAT_{PUBLIC,PRIVATE}_SEPOLICY_DIR}` set, observe error Signed-off-by: Felix Elsner <google@ix5.org> Change-Id: Ic4d1164be611836f6aa697fbf1cb1f1c73a3cd39
This commit is contained in:
parent
25ccba8a16
commit
6c99a6781c
13
Android.mk
13
Android.mk
@ -55,12 +55,21 @@ REQD_MASK_POLICY := $(LOCAL_PATH)/reqd_mask
|
|||||||
|
|
||||||
SYSTEM_EXT_PUBLIC_POLICY := $(SYSTEM_EXT_PUBLIC_SEPOLICY_DIRS)
|
SYSTEM_EXT_PUBLIC_POLICY := $(SYSTEM_EXT_PUBLIC_SEPOLICY_DIRS)
|
||||||
ifneq (,$(BOARD_PLAT_PUBLIC_SEPOLICY_DIR))
|
ifneq (,$(BOARD_PLAT_PUBLIC_SEPOLICY_DIR))
|
||||||
# TODO: Disallow BOARD_PLAT_*
|
# Must use new variable name for devices launched on S
|
||||||
|
ifdef PRODUCT_SHIPPING_API_LEVEL
|
||||||
|
ifneq ($(call math_gt_or_eq,$(PRODUCT_SHIPPING_API_LEVEL),31),)
|
||||||
|
$(error Please use SYSTEM_EXT_PUBLIC_SEPOLICY_DIRS instead of the old variable BOARD_PLAT_PUBLIC_SEPOLICY_DIR)
|
||||||
|
endif
|
||||||
|
endif
|
||||||
SYSTEM_EXT_PUBLIC_POLICY += $(BOARD_PLAT_PUBLIC_SEPOLICY_DIR)
|
SYSTEM_EXT_PUBLIC_POLICY += $(BOARD_PLAT_PUBLIC_SEPOLICY_DIR)
|
||||||
endif
|
endif
|
||||||
SYSTEM_EXT_PRIVATE_POLICY := $(SYSTEM_EXT_PRIVATE_SEPOLICY_DIRS)
|
SYSTEM_EXT_PRIVATE_POLICY := $(SYSTEM_EXT_PRIVATE_SEPOLICY_DIRS)
|
||||||
ifneq (,$(BOARD_PLAT_PRIVATE_SEPOLICY_DIR))
|
ifneq (,$(BOARD_PLAT_PRIVATE_SEPOLICY_DIR))
|
||||||
# TODO: Disallow BOARD_PLAT_*
|
ifdef PRODUCT_SHIPPING_API_LEVEL
|
||||||
|
ifneq ($(call math_gt_or_eq,$(PRODUCT_SHIPPING_API_LEVEL),31),)
|
||||||
|
$(error Please use SYSTEM_EXT_PRIVATE_SEPOLICY_DIRS instead of the old variable BOARD_PLAT_PRIVATE_SEPOLICY_DIR)
|
||||||
|
endif
|
||||||
|
endif
|
||||||
SYSTEM_EXT_PRIVATE_POLICY += $(BOARD_PLAT_PRIVATE_SEPOLICY_DIR)
|
SYSTEM_EXT_PRIVATE_POLICY += $(BOARD_PLAT_PRIVATE_SEPOLICY_DIR)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user