summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2018-04-13 11:34:54 +0200
committerandroid-build-team Robot <android-build-team-robot@google.com>2018-04-13 11:34:54 +0200
commit81727699b4a58aa32c99b7e698d645fdb2c59408 (patch)
treec6d54abea68cb738ba24d663a4075db57f4773c6
parentSnap for 4707145 from d4dd093d08b24f7b934496ddc48b681b143d2086 to qt-release (diff)
parentMerge "recovery: enable fsverity feature bit" into pi-dev am: 257dd337da (diff)
downloadandroid_bootable_recovery-81727699b4a58aa32c99b7e698d645fdb2c59408.tar
android_bootable_recovery-81727699b4a58aa32c99b7e698d645fdb2c59408.tar.gz
android_bootable_recovery-81727699b4a58aa32c99b7e698d645fdb2c59408.tar.bz2
android_bootable_recovery-81727699b4a58aa32c99b7e698d645fdb2c59408.tar.lz
android_bootable_recovery-81727699b4a58aa32c99b7e698d645fdb2c59408.tar.xz
android_bootable_recovery-81727699b4a58aa32c99b7e698d645fdb2c59408.tar.zst
android_bootable_recovery-81727699b4a58aa32c99b7e698d645fdb2c59408.zip
-rw-r--r--Android.mk2
-rw-r--r--roots.cpp1
-rw-r--r--updater/install.cpp10
3 files changed, 6 insertions, 7 deletions
diff --git a/Android.mk b/Android.mk
index a8b52b4f5..ed09b4949 100644
--- a/Android.mk
+++ b/Android.mk
@@ -156,7 +156,7 @@ LOCAL_STATIC_LIBRARIES := \
libhealthstoragedefault \
libhidltransport \
libhidlbase \
- libhwbinder_nolto \
+ libhwbinder_noltopgo \
libvndksupport \
libbatterymonitor
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 };