tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "liblp: fix host lpdump cannot work issue" am: 29e7b2af30 am: 4852a2654a

Browse source 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1320937

Change-Id: I46f204150da37f1c5b322148c9d6de82c59ad229
This commit is contained in:
David Anderson 2020-09-02 18:18:09 +00:00 committed by Automerger Merge Worker
commit 89622b466e
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
fs_mgr/liblp/partition_opener.cpp
View file

@ -38,6 +38,9 @@ using android::base::unique_fd;
namespace {
std::string GetPartitionAbsolutePath(const std::string& path) {
#if !defined(__ANDROID__)
return path;
#else
if (android::base::StartsWith(path, "/")) {
return path;
}
@ -56,6 +59,7 @@ std::string GetPartitionAbsolutePath(const std::string& path) {
}
}
return by_name;
#endif
}
bool GetBlockDeviceInfo(const std::string& block_device, BlockDeviceInfo* device_info) {