Snap for 5949240 from b527961265c8e6064456548239a6c88f476b3bec to sdk-release
Change-Id: Ic89e857fab4044437ad338c589d5caaab83936f7
diff --git a/init.common.rc b/init.common.rc
index a8dc977..9c67151 100644
--- a/init.common.rc
+++ b/init.common.rc
@@ -8,7 +8,7 @@
write /sys/devices/soc/624000.ufshc/624000.ufshc:ufs_variant/pm_qos_enable 1
write /sys/module/lpm_levels/parameters/sleep_disabled N
-service vendor.charger /charger
+service vendor.charger /system/bin/charger
class charger
seclabel u:r:charger:s0
diff --git a/marlin/BoardConfig.mk b/marlin/BoardConfig.mk
index b4278cf..e621a2a 100644
--- a/marlin/BoardConfig.mk
+++ b/marlin/BoardConfig.mk
@@ -218,3 +218,6 @@
# 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 5b9632b..77c0d3d 100644
--- a/sailfish/BoardConfig.mk
+++ b/sailfish/BoardConfig.mk
@@ -217,3 +217,6 @@
# 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
