Merge "liblp: fix host lpdump cannot work issue"

dvandercorp · Gerrit Code Review · commit 29e7b2af306c · 2020-09-02T17:36:00.000Z
diff --git 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) {

Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,9 @@ using android::base::unique_fd;`
`38`	`38`	`namespace {`
`39`	`39`
`40`	`40`	`std::string GetPartitionAbsolutePath(const std::string& path) {`
	`41`	`+#if !defined(__ANDROID__)`
	`42`	`+ return path;`
	`43`	`+#else`
`41`	`44`	`if (android::base::StartsWith(path, "/")) {`
`42`	`45`	`return path;`
`43`	`46`	`}`
`@@ -56,6 +59,7 @@ std::string GetPartitionAbsolutePath(const std::string& path) {`
`56`	`59`	`}`
`57`	`60`	`}`
`58`	`61`	`return by_name;`
	`62`	`+#endif`
`59`	`63`	`}`
`60`	`64`
`61`	`65`	`bool GetBlockDeviceInfo(const std::string& block_device, BlockDeviceInfo* device_info) {`