commit cd5021ee04d1aed1bae94e6c1456d956e4da544c
author Daniel Rosenberg <drosen@google.com> Tue Aug 23 04:30:33 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Aug 23 04:30:33 2016 +0000
tree 32fcec7d05bd8efdb27a25915f4de4e072473dc2
parent 7f6b82da5d67d71b053f6429854450198b13b82e
parent b6b0598d585479ae4f319831ef9b0e5f071f7b72

DO NOT MERGE: Fix bug in product path building
am: 9914284d6a

Change-Id: I94410e65b1e1bbdf05cddf7cbf11f9b946f64dd5

fastboot/fastboot.cpp

diff --git a/fastboot/fastboot.cpp b/fastboot/fastboot.cpp
index c1c3174..2b6cad1 100644
--- a/fastboot/fastboot.cpp
+++ b/fastboot/fastboot.cpp
@@ -116,16 +116,18 @@
 };
 
 static std::string find_item_given_name(const char* img_name, const char* product) {
-    char *dir;
-    char path[PATH_MAX + 128];
+    char path_c_str[PATH_MAX + 128];
 
     if(product) {
-        get_my_path(path);
-        return android::base::StringPrintf("../../../target/product/%s/%s", product, img_name);
+        get_my_path(path_c_str);
+        std::string path = path_c_str;
+        path.erase(path.find_last_of('/'));
+        return android::base::StringPrintf("%s/../../../target/product/%s/%s",
+                                           path.c_str(), product, img_name);
     }
 
-    dir = getenv("ANDROID_PRODUCT_OUT");
-    if((dir == 0) || (dir[0] == 0)) {
+    char *dir = getenv("ANDROID_PRODUCT_OUT");
+    if (dir == nullptr || dir[0] == '\0') {
         die("neither -p product specified nor ANDROID_PRODUCT_OUT set");
     }