commit b6b0598d585479ae4f319831ef9b0e5f071f7b72
author Daniel Rosenberg <drosen@google.com> Fri Aug 19 15:36:24 2016 -0700
committer Daniel Rosenberg <drosen@google.com> Tue Aug 23 00:26:19 2016 +0000
tree eed1bc6ebfe707207ad25aee794d70c2ee79285b
parent 4ee959610514bbf987151a31261ff0b3dc81a017

DO NOT MERGE: Fix bug in product path building

-p <product> was failing to find the product image files since
get_my_path's result was ignored. As it was, it would only work
if you happened to call it from $OUT.

Change-Id: Id4183cb7fafb313c0b1feff93d7e22fd4658d267
Bug: 31022767

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");
     }