Snap for 5667727 from 320211cbba531983d3646085adc1da11f4d15fae to qt-qpr1-release

Change-Id: I4648df6648df8652fa2700532494700229583da7

1 files changed, 7 insertions, 1 deletions

diff --git a/init/property_service.cpp b/init/property_service.cpp
index fce8d578f..f2c7462ab 100644
--- a/init/property_service.cpp
+++ b/init/property_service.cpp
@@ -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;