diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-10-11 14:56:49 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-10-11 14:56:49 +0000 |
| commit | 8ef3fe14bb42b9383b3d1730eb8ef2c3edbd52cc (patch) | |
| tree | 46ca884aebb68e0bfac9a22e3baa68c57cea2ec0 /fs_mgr/fs_mgr.cpp | |
| parent | 86554e949b955c639ee932917495cb4f85355fdb (diff) | |
| parent | d556c41a48fc3d6b6127da24490ec03416d213a1 (diff) | |
Merge "fs_mgr: deprecate check for ro.build.system_root_image"
Diffstat (limited to 'fs_mgr/fs_mgr.cpp')
| -rw-r--r-- | fs_mgr/fs_mgr.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/fs_mgr/fs_mgr.cpp b/fs_mgr/fs_mgr.cpp index 3226010454..a6ef35bc06 100644 --- a/fs_mgr/fs_mgr.cpp +++ b/fs_mgr/fs_mgr.cpp @@ -1546,8 +1546,6 @@ bool fs_mgr_update_verity_state(std::function<fs_mgr_verity_state_callback> call DeviceMapper& dm = DeviceMapper::Instance(); - bool system_root = android::base::GetProperty("ro.build.system_root_image", "") == "true"; - for (int i = 0; i < fstab->num_entries; i++) { auto fsrec = &fstab->recs[i]; if (!fs_mgr_is_verified(fsrec) && !fs_mgr_is_avb(fsrec)) { @@ -1555,7 +1553,7 @@ bool fs_mgr_update_verity_state(std::function<fs_mgr_verity_state_callback> call } std::string mount_point; - if (system_root && !strcmp(fsrec->mount_point, "/")) { + if (!strcmp(fsrec->mount_point, "/")) { // In AVB, the dm device name is vroot instead of system. mount_point = fs_mgr_is_avb(fsrec) ? "vroot" : "system"; } else { |