summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelix <google@ix5.org>2020-05-22 00:45:29 +0200
committerFelix <google@ix5.org>2020-05-22 00:45:29 +0200
commitfdb48541be047719cda009ef597c625fc65f3bb7 (patch)
treee290a0ece48715e12070b7126719177da34027ee
parentdacc36c97974f4993c25b001bfca8677f8129f0a (diff)
downloadmarlin-fdb48541be047719cda009ef597c625fc65f3bb7.tar.gz
BoardConfig: Use SYSTEM_*_SEPOLICY_DIRSHEADmastermain
The old variable name is being deprecated on API level 31+. See https://android-review.googlesource.com/q/topic:"board-system-ext-sepolicy" Signed-off-by: Felix <google@ix5.org> Change-Id: I9b65f43060d503ab2d05ced8742b3dcce699c8f5
-rw-r--r--marlin/BoardConfig.mk4
-rw-r--r--sailfish/BoardConfig.mk4
2 files changed, 4 insertions, 4 deletions
diff --git a/marlin/BoardConfig.mk b/marlin/BoardConfig.mk
index b4278cfd..c9a71965 100644
--- a/marlin/BoardConfig.mk
+++ b/marlin/BoardConfig.mk
@@ -102,8 +102,8 @@ BOARD_VENDOR_SEPOLICY_DIRS += device/google/marlin/sepolicy
ifneq ($(filter marlin marlinf, $(TARGET_PRODUCT)),)
BOARD_VENDOR_SEPOLICY_DIRS += device/google/marlin/sepolicy/verizon
endif
-BOARD_PLAT_PUBLIC_SEPOLICY_DIR := device/google/marlin/sepolicy/public
-BOARD_PLAT_PRIVATE_SEPOLICY_DIR := device/google/marlin/sepolicy/private
+SYSTEM_EXT_PUBLIC_SEPOLICY_DIRS := device/google/marlin/sepolicy/public
+SYSTEM_EXT_PRIVATE_SEPOLICY_DIRS := device/google/marlin/sepolicy/private
TARGET_FS_CONFIG_GEN := device/google/marlin/config.fs
diff --git a/sailfish/BoardConfig.mk b/sailfish/BoardConfig.mk
index 5b9632bf..4d8d1907 100644
--- a/sailfish/BoardConfig.mk
+++ b/sailfish/BoardConfig.mk
@@ -101,8 +101,8 @@ BOARD_VENDOR_SEPOLICY_DIRS += device/google/marlin/sepolicy
ifneq ($(filter sailfish sailfishf, $(TARGET_PRODUCT)),)
BOARD_VENDOR_SEPOLICY_DIRS += device/google/marlin/sepolicy/verizon
endif
-BOARD_PLAT_PUBLIC_SEPOLICY_DIR := device/google/marlin/sepolicy/public
-BOARD_PLAT_PRIVATE_SEPOLICY_DIR := device/google/marlin/sepolicy/private
+SYSTEM_EXT_PUBLIC_SEPOLICY_DIRS := device/google/marlin/sepolicy/public
+SYSTEM_EXT_PRIVATE_SEPOLICY_DIRS := device/google/marlin/sepolicy/private
TARGET_FS_CONFIG_GEN := device/google/marlin/config.fs