commit bde7ea7f82272cc073b1d19e942c4141b338d69a
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Jun 17 22:30:28 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jun 17 22:30:28 2019 +0000
tree 9a9478c000f0104496e7fd5b0ef8d29e125b8566
parent c8a63e6ebc178b63b1ce099e128fadf78b36091c
parent b9df5b19e9248cacb33210a62329f9989d2c0dec

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

init/property_service.cpp

diff --git a/init/property_service.cpp b/init/property_service.cpp
index fce8d57..f2c7462 100644
--- a/init/property_service.cpp
+++ b/init/property_service.cpp
@@ -642,8 +642,14 @@
                 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;