summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorInseob Kim <inseob@google.com>2019-10-15 13:21:09 +0900
committerInseob Kim <inseob@google.com>2019-10-15 13:21:09 +0900
commit3a0f9ac469a152fe66be0cb3d6b25d1cb0445c96 (patch)
tree428abb92f6a61e866b1be21071116c6155a8a05b
parentd84c6b8b35601f7f6b78fba88956092e237928c5 (diff)
downloadmarlin-3a0f9ac469a152fe66be0cb3d6b25d1cb0445c96.tar.gz
Set BUILD_BROKEN_TREBLE_SYSPROP_NEVERALLOW
This turns off treble sysprop neverallow rules introduced in Android R. Bug: 131162102 Bug: 142684203 Test: m sepolicy_tests Change-Id: I23bb4b4f7a033ad3e8803fcff3b916028fdfe399
-rw-r--r--marlin/BoardConfig.mk3
-rw-r--r--sailfish/BoardConfig.mk3
2 files changed, 6 insertions, 0 deletions
diff --git a/marlin/BoardConfig.mk b/marlin/BoardConfig.mk
index b4278cfd..e621a2ac 100644
--- a/marlin/BoardConfig.mk
+++ b/marlin/BoardConfig.mk
@@ -218,3 +218,6 @@ AB_OTA_PARTITIONS += \
# Partitions (listed in the file) to be wiped under recovery.
TARGET_RECOVERY_WIPE := device/google/marlin/recovery.wipe.common
+
+# TODO(b/131162102): remove this after cleaning up accesses of sysprop
+BUILD_BROKEN_TREBLE_SYSPROP_NEVERALLOW := true
diff --git a/sailfish/BoardConfig.mk b/sailfish/BoardConfig.mk
index 5b9632bf..77c0d3d8 100644
--- a/sailfish/BoardConfig.mk
+++ b/sailfish/BoardConfig.mk
@@ -217,3 +217,6 @@ AB_OTA_PARTITIONS += \
# Partitions (listed in the file) to be wiped under recovery.
TARGET_RECOVERY_WIPE := device/google/marlin/recovery.wipe.common
+
+# TODO(b/131162102): remove this after cleaning up accesses of sysprop
+BUILD_BROKEN_TREBLE_SYSPROP_NEVERALLOW := true