summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Rosenberg <drosen@google.com>2014-11-11 20:39:57 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-11-11 20:39:58 +0000
commit4b862563be2627864590be7dd071c1d0289a6f33 (patch)
tree4e1fe09178c76cf3937e47a3cbba15f25c3cc0fd
parent2c0839e9dba6d9d282f8391c3edb14236f56618d (diff)
parentb95122205dba535215ff6b011ef8009933c55d3b (diff)
downloadsystem_core-4b862563be2627864590be7dd071c1d0289a6f33.zip
system_core-4b862563be2627864590be7dd071c1d0289a6f33.tar.gz
system_core-4b862563be2627864590be7dd071c1d0289a6f33.tar.bz2
Merge "property_service: Added vendor build properties to load_all_props"
-rw-r--r--init/property_service.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/init/property_service.c b/init/property_service.c
index d908ba8..44658c5 100644
--- a/init/property_service.c
+++ b/init/property_service.c
@@ -538,6 +538,7 @@ void load_all_props(void)
{
load_properties_from_file(PROP_PATH_SYSTEM_BUILD, NULL);
load_properties_from_file(PROP_PATH_SYSTEM_DEFAULT, NULL);
+ load_properties_from_file(PROP_PATH_VENDOR_BUILD, NULL);
load_properties_from_file(PROP_PATH_FACTORY, "ro.*");
load_override_properties();