commit 9eb35e99b4401737156d0a0c7541603caf2709d4
author Mathew Inwood <mathewi@google.com> Wed Apr 11 16:45:27 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 11 16:45:27 2018 +0000
tree 45131659f43517915a470691b2abaa9a29123f38
parent 4e8b3e5d1fd653e1527f8db15a03d061ea99d40d
parent 014abb2837dbabc785c26d60bb8d39d61f51faba

Merge "Add event log tag for hidden API access logging." into pi-dev

fastboot/fs.cpp

diff --git a/fastboot/fs.cpp b/fastboot/fs.cpp
index a1e1677..c30ca1e 100644
--- a/fastboot/fs.cpp
+++ b/fastboot/fs.cpp
@@ -177,6 +177,8 @@
     mkf2fs_args.push_back("encrypt");
     mkf2fs_args.push_back("-O");
     mkf2fs_args.push_back("quota");
+    mkf2fs_args.push_back("-O");
+    mkf2fs_args.push_back("verity");
     mkf2fs_args.push_back(fileName);
     mkf2fs_args.push_back(nullptr);
 

fs_mgr/fs_mgr_format.cpp

diff --git a/fs_mgr/fs_mgr_format.cpp b/fs_mgr/fs_mgr_format.cpp
index 63a6839..845cca9 100644
--- a/fs_mgr/fs_mgr_format.cpp
+++ b/fs_mgr/fs_mgr_format.cpp
@@ -121,6 +121,7 @@
         "-f",
         "-O", "encrypt",
         "-O", "quota",
+        "-O", "verity",
         "-w", "4096",
         fs_blkdev,
         size_str.c_str(),

healthd/Android.mk

diff --git a/healthd/Android.mk b/healthd/Android.mk
index 00ae159..818488d 100644
--- a/healthd/Android.mk
+++ b/healthd/Android.mk
@@ -100,7 +100,7 @@
     android.hardware.health@1.0-convert \
     libhidltransport \
     libhidlbase \
-    libhwbinder_nolto \
+    libhwbinder_noltopgo \
     libhealthstoragedefault \
     libvndksupport \
     libhealthd_charger \