summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2019-10-18 11:09:55 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2019-10-18 11:09:55 +0000
commitcf1b301966adfba778a55816cabf4cb22f0b2632 (patch)
tree1fad11a28cad6b64de9bde3561a1cf5bd79b637a
parentb527961265c8e6064456548239a6c88f476b3bec (diff)
parent2bbb8c2aef471f672f55db3173c3bef88f7064a0 (diff)
downloadmarlin-cf1b301966adfba778a55816cabf4cb22f0b2632.tar.gz
Merge "Revert "Set BUILD_BROKEN_TREBLE_SYSPROP_NEVERALLOW""
-rw-r--r--marlin/BoardConfig.mk3
-rw-r--r--sailfish/BoardConfig.mk3
2 files changed, 0 insertions, 6 deletions
diff --git a/marlin/BoardConfig.mk b/marlin/BoardConfig.mk
index e621a2ac..b4278cfd 100644
--- a/marlin/BoardConfig.mk
+++ b/marlin/BoardConfig.mk
@@ -218,6 +218,3 @@ 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 77c0d3d8..5b9632bf 100644
--- a/sailfish/BoardConfig.mk
+++ b/sailfish/BoardConfig.mk
@@ -217,6 +217,3 @@ 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