commit 0a968d2f62c9cf6ca6a8cd6d8d51fd550dfce715
author android-build-team Robot <android-build-team-robot@google.com> Sun Apr 08 07:26:24 2018 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Sun Apr 08 07:26:24 2018 +0000
tree 312c28b05877b2a8e678c6c8532a56df2c601703
parent 3ea872cc298c6936a3dcd35ff994561b415755f8
parent 7fdb6355e4482da80c8e4633fc54a72380881965

Snap for 4706961 from 7fdb6355e4482da80c8e4633fc54a72380881965 to pi-release

Change-Id: Iea61f6f7d5d8b6f825a06d28b3a6f4d8ef7cbe38

Android.mk

diff --git a/Android.mk b/Android.mk
index 461ad94..4f7ced2 100644
--- a/Android.mk
+++ b/Android.mk
@@ -156,7 +156,7 @@
     libhealthstoragedefault \
     libhidltransport \
     libhidlbase \
-    libhwbinder \
+    libhwbinder_nolto \
     libvndksupport \
     libbatterymonitor
 

updater/install.cpp

diff --git a/updater/install.cpp b/updater/install.cpp
index 2b6c20f..6732ab8 100644
--- a/updater/install.cpp
+++ b/updater/install.cpp
@@ -548,6 +548,8 @@
                                 "encrypt",
                                 "-O",
                                 "quota",
+                                "-w",
+                                "512",
                                 location.c_str(),
                                 (size < 512) ? nullptr : num_sectors.c_str(),
                                 nullptr };