Commit: ca11f4699ce3799cde02b456895ef31017978025 - system-core (git)

system/core

Commit MetaInfo

• Revisão: ca11f4699ce3799cde02b456895ef31017978025 (tree)
• Hora: 2019-06-18 07:56:11
• Autor: Dongcheol Shin <dc.shin@lge....>
• Commiter: android-build-merger

Mensagem de Log

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

Change-Id: Iff4adad019e0f919536d1cce0ed55d536ea65e4e

Mudança Sumário

• modified: init/property_service.cpp

Diff

--- 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;