summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Rosenberg <drosen@google.com>2014-11-11 22:52:07 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-11-11 22:52:07 +0000
commit9eb0ef6f40a3c84f317fa6548bfe1173e92497d5 (patch)
treef88f251110d637df00d38cb9a26725835295e974
parentd94793afb165e92a086309a3070f572bcebd272d (diff)
parent82831c3d26e5b38bd24bbd241dac40e09fd9ba4b (diff)
downloadsystem_core-9eb0ef6f40a3c84f317fa6548bfe1173e92497d5.zip
system_core-9eb0ef6f40a3c84f317fa6548bfe1173e92497d5.tar.gz
system_core-9eb0ef6f40a3c84f317fa6548bfe1173e92497d5.tar.bz2
am 82831c3d: am 4b862563: Merge "property_service: Added vendor build properties to load_all_props"
* commit '82831c3d26e5b38bd24bbd241dac40e09fd9ba4b': 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();