PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "roots: Remove #include "common.h"."

Browse Source 
am: e8ee697364

Change-Id: Ie2ef76fe06bfb181a0bc715762cb3f4a7912c376
This commit is contained in:
Tao Bao
2017-10-02 17:55:13 +00:00
committed by android-build-merger
parent 2812e5d16b e8ee697364
commit 0fa08924c6
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
roots.cpp
+2 -2
View File
@@ -20,6 +20,7 @@
#include <fcntl.h> #include <fcntl.h>
#include <stdint.h> #include <stdint.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h>
#include <sys/mount.h> #include <sys/mount.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/types.h> #include <sys/types.h>
@@ -38,7 +39,6 @@
#include <ext4_utils/wipe.h> #include <ext4_utils/wipe.h>
#include <fs_mgr.h> #include <fs_mgr.h>
#include "common.h"
#include "mounts.h" #include "mounts.h"
static struct fstab* fstab = nullptr; static struct fstab* fstab = nullptr;
@@ -77,7 +77,7 @@ Volume* volume_for_path(const char* path) {
if (path == nullptr || path[0] == '\0') return nullptr; if (path == nullptr || path[0] == '\0') return nullptr;
std::string str(path); std::string str(path);
while (true) { while (true) {
Volume* result = fs_mgr_get_entry_for_mount_point(fstab, str.c_str()); Volume* result = fs_mgr_get_entry_for_mount_point(fstab, str);
if (result != nullptr || str == "/") { if (result != nullptr || str == "/") {
return result; return result;
} }