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

Merge "Support importing property file with expanded name" into qt-dev

Browse source
This commit is contained in:
TreeHugger Robot 2019-06-17 22:30:28 +00:00 • committed by Android (Google) Code Review
commit fa94b8f96b
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

@ -642,8 +642,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;