diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2018-04-11 09:27:26 +0200 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-04-11 09:27:26 +0200 |
| commit | add3e9c1e53aec7238e708ca86073dc87c5dc8c3 (patch) | |
| tree | d793d8f8bb0f209409bee374c1924acbc52c9892 | |
| parent | Snap for 4706961 from 7fdb6355e4482da80c8e4633fc54a72380881965 to pi-release (diff) | |
| parent | Merge "recovery: enable fsverity feature bit" into pi-dev (diff) | |
| download | android_bootable_recovery-add3e9c1e53aec7238e708ca86073dc87c5dc8c3.tar android_bootable_recovery-add3e9c1e53aec7238e708ca86073dc87c5dc8c3.tar.gz android_bootable_recovery-add3e9c1e53aec7238e708ca86073dc87c5dc8c3.tar.bz2 android_bootable_recovery-add3e9c1e53aec7238e708ca86073dc87c5dc8c3.tar.lz android_bootable_recovery-add3e9c1e53aec7238e708ca86073dc87c5dc8c3.tar.xz android_bootable_recovery-add3e9c1e53aec7238e708ca86073dc87c5dc8c3.tar.zst android_bootable_recovery-add3e9c1e53aec7238e708ca86073dc87c5dc8c3.zip | |
| -rw-r--r-- | Android.mk | 2 | ||||
| -rw-r--r-- | roots.cpp | 1 | ||||
| -rw-r--r-- | updater/install.cpp | 10 |
3 files changed, 6 insertions, 7 deletions
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 @@ -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 }; |