From 10b3faa10db9ea1af66f2ae8ecdf9225f882f7f6 Mon Sep 17 00:00:00 2001
From: Yi Kong <yikong@google.com>
Date: Tue, 3 Apr 2018 12:45:45 -0700
Subject: Use non-LTO variant of libhwbinder

... as a workaround for build system does not currently infer non-LTO
usage from Android.mk.

Test: m
Bug: 77320844
Change-Id: I6e9954b895051cc20408a30d0761e164e4c5bfd9
---
 Android.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Android.mk b/Android.mk
index 461ad9449..4f7ced268 100644
--- a/Android.mk
+++ b/Android.mk
@@ -156,7 +156,7 @@ LOCAL_STATIC_LIBRARIES := \
     libhealthstoragedefault \
     libhidltransport \
     libhidlbase \
-    libhwbinder \
+    libhwbinder_nolto \
     libvndksupport \
     libbatterymonitor
 
-- 
cgit v1.2.3


From 1224544806382ca98bbb7d9edba83b0c2e1be21f Mon Sep 17 00:00:00 2001
From: Jaegeuk Kim <jaegeuk@google.com>
Date: Wed, 4 Apr 2018 21:14:01 -0700
Subject: install: mkfs.f2fs: specify sector size for target image size

The total sectors that we want to format is used in different meanings from
various users. This notifies its size based on 512 bytes explicitly.

Bug: 76407663
Change-Id: I20687b40a1733d3b459a45f8b64a338c37a7bc95
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
---
 updater/install.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/updater/install.cpp b/updater/install.cpp
index 2b6c20fe3..6732ab897 100644
--- a/updater/install.cpp
+++ b/updater/install.cpp
@@ -548,6 +548,8 @@ Value* FormatFn(const char* name, State* state, const std::vector<std::unique_pt
                                 "encrypt",
                                 "-O",
                                 "quota",
+                                "-w",
+                                "512",
                                 location.c_str(),
                                 (size < 512) ? nullptr : num_sectors.c_str(),
                                 nullptr };
-- 
cgit v1.2.3