diff options
| author | android-build-prod (mdb) <android-build-team-robot@google.com> | 2019-10-18 00:14:53 +0000 |
|---|---|---|
| committer | android-build-prod (mdb) <android-build-team-robot@google.com> | 2019-10-18 00:14:53 +0000 |
| commit | 27a275ab334ce3d6247d6b11b5507607535717d3 (patch) | |
| tree | 7afcccfe88b9bd4b034ffc262a52e495d5a5afff | |
| parent | 36939583522d18bfae28114e39f35aeda01acfce (diff) | |
| parent | b527961265c8e6064456548239a6c88f476b3bec (diff) | |
| download | marlin-sdk-release.tar.gz | |
Snap for 5949240 from b527961265c8e6064456548239a6c88f476b3bec to sdk-releaseplatform-tools-29.0.6platform-tools-29.0.5sdk-release
Change-Id: Ic89e857fab4044437ad338c589d5caaab83936f7
| -rw-r--r-- | init.common.rc | 2 | ||||
| -rw-r--r-- | marlin/BoardConfig.mk | 3 | ||||
| -rw-r--r-- | sailfish/BoardConfig.mk | 3 |
3 files changed, 7 insertions, 1 deletions
diff --git a/init.common.rc b/init.common.rc index a8dc9775..9c671517 100644 --- a/init.common.rc +++ b/init.common.rc @@ -8,7 +8,7 @@ on charger 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 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 |