summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-prod (mdb) <android-build-team-robot@google.com>2019-10-16 04:15:12 +0000
committerandroid-build-prod (mdb) <android-build-team-robot@google.com>2019-10-16 04:15:12 +0000
commit165e0603c92a788ec911a9af7317a85e7b42bc60 (patch)
tree428abb92f6a61e866b1be21071116c6155a8a05b
parentfbedf2ced444dd919384251da7c51e4772220599 (diff)
parent3a0f9ac469a152fe66be0cb3d6b25d1cb0445c96 (diff)
downloadmarlin-simpleperf-release.tar.gz
Snap for 5942275 from 3a0f9ac469a152fe66be0cb3d6b25d1cb0445c96 to simpleperf-releasesimpleperf-release
Change-Id: I7e0cfcf908170ef26bb67c0a309791af3e0d765c
-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