Merge "liblp: fix host lpdump cannot work issue"

2020-09-02 17:36:00 +00:00 · 2020-09-02 17:36:00 +00:00 · 29e7b2af30
parent 6233b23918 ecd9b0d8db
commit 29e7b2af30
1 changed files with 4 additions and 0 deletions
--- a/fs_mgr/liblp/partition_opener.cpp
+++ b/fs_mgr/liblp/partition_opener.cpp
@ -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) {