ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

DO NOT MERGE: Fix bug in product path building

Browse source 
-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
This commit is contained in:
Daniel Rosenberg 2016-08-19 15:36:24 -07:00
parent 0c28557e58
commit 9914284d6a
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
fastboot/fastboot.cpp
View file

@ -116,16 +116,18 @@ static struct {
};
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");
}