summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Rosenberg <drosen@google.com>2014-11-14 01:08:16 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-11-14 01:08:17 +0000
commit323df093c842e17b69d2be02462053697ef4d92e (patch)
tree09702e58a75c0cdb835853a9448afb711bf40dad
parent72f0d92c722447e0c87cfe765516a7352db3d51a (diff)
parent4cf5297cc8eb18e521f9491c7d973798dcae48ca (diff)
downloadcore-323df093c842e17b69d2be02462053697ef4d92e.tar.gz
Merge "property_service: Added vendor build properties to load_all_props" into lmp-mr1-dev
-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 1902b7760..91ef2518f 100644
--- a/init/property_service.c
+++ b/init/property_service.c
@@ -540,6 +540,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();