tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Support importing property file with expanded name" am: 69880e1a39

Browse source 
am: c3967a111d

Change-Id: I59419d8087ca0d2f13685bf86e3c122ae61dc0ab
This commit is contained in:
Dongcheol Shin 2019-06-13 18:51:49 -07:00 committed by android-build-merger
commit 9b3ad8846b
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
init/property_service.cpp
View file

@ -645,8 +645,14 @@ static void LoadProperties(char* data, const char* filter, const char* filename,
while (isspace(*key)) key++;
}
load_properties_from_file(fn, key, properties);
std::string raw_filename(fn);
std::string expanded_filename;
if (!expand_props(raw_filename, &expanded_filename)) {
LOG(ERROR) << "Could not expand filename '" << raw_filename << "'";
continue;
}
load_properties_from_file(expanded_filename.c_str(), key, properties);
} else {
value = strchr(key, '=');
if (!value) continue;