From 2e5dc84d51728644436dfbbacbed054f10e923f5 Mon Sep 17 00:00:00 2001
From: Jaegeuk Kim <jaegeuk@google.com>
Date: Thu, 5 Apr 2018 22:42:13 -0700
Subject: recovery: enable fsverity feature bit

Bug: 74604441
Bug 67380979
Change-Id: Iab1cc9aef356f0ddf6e2491578a2bd53009182ce
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
---
 roots.cpp           |  1 +
 updater/install.cpp | 10 ++++------
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/roots.cpp b/roots.cpp
index 8907bbd9b..184e7992b 100644
--- a/roots.cpp
+++ b/roots.cpp
@@ -333,6 +333,7 @@ int format_volume(const char* volume, const char* directory) {
     "-f",
     "-O", "encrypt",
     "-O", "quota",
+    "-O", "verity",
     "-w", std::to_string(kSectorSize),
     v->blk_device,
   };
diff --git a/updater/install.cpp b/updater/install.cpp
index 6732ab897..9be7645f3 100644
--- a/updater/install.cpp
+++ b/updater/install.cpp
@@ -544,12 +544,10 @@ Value* FormatFn(const char* name, State* state, const std::vector<std::unique_pt
     const char* f2fs_argv[] = { "mkfs.f2fs",
                                 "-d1",
                                 "-f",
-                                "-O",
-                                "encrypt",
-                                "-O",
-                                "quota",
-                                "-w",
-                                "512",
+                                "-O", "encrypt",
+                                "-O", "quota",
+                                "-O", "verity",
+                                "-w", "512",
                                 location.c_str(),
                                 (size < 512) ? nullptr : num_sectors.c_str(),
                                 nullptr };
-- 
cgit v1.2.3


From 2ca4a403e72e9b602d8ff656b405266c3b24a16e Mon Sep 17 00:00:00 2001
From: Pirama Arumuga Nainar <pirama@google.com>
Date: Mon, 9 Apr 2018 10:38:24 -0700
Subject: Use the non-LTO, non-PGO version of libhwbinder

Bug: http://b/77320844

Android.mk doesn't have support for PGO either.  This causes linker
error (about missing __llvm_profile symbols) in the PGO-instrumentation
enabled builds in the release branch.

Test: m ANDROID_PGO_INSTRUMENT=ALL
Change-Id: Ib5dfdea88073bd95da2cd02e92c85bfffcca80d6
---
 Android.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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