commit 6d5b37caba57fef12f193f5d3eafcf44921ee441
author Elliott Hughes <enh@google.com> Sat Jan 28 16:51:06 2017 +0000
committer android-build-merger <android-build-merger@google.com> Sat Jan 28 16:51:06 2017 +0000
tree dad5d66eef93e4a2a537796db1ede2deb4ac5b29
parent b566804ac632e1f3c7080ddde72491404e44803d
parent 1890bd1b2e7488a92714ed07c68b529ee99d94de

Merge "bionic and init don't need to share knowledge of property file locations." am: 9cd890e9b7
am: 1890bd1b2e

Change-Id: I029da89e05b6bc5eff525742241132ea77275616

init/property_service.cpp

diff --git a/init/property_service.cpp b/init/property_service.cpp
index 7e11ff0..ce197ee 100644
--- a/init/property_service.cpp
+++ b/init/property_service.cpp
@@ -575,16 +575,16 @@
 }
 
 void property_load_boot_defaults() {
-    load_properties_from_file(PROP_PATH_RAMDISK_DEFAULT, NULL);
-    load_properties_from_file(PROP_PATH_ODM_DEFAULT, NULL);
-    load_properties_from_file(PROP_PATH_VENDOR_DEFAULT, NULL);
+    load_properties_from_file("/default.prop", NULL);
+    load_properties_from_file("/odm/default.prop", NULL);
+    load_properties_from_file("/vendor/default.prop", NULL);
 }
 
 static void load_override_properties() {
     if (ALLOW_LOCAL_PROP_OVERRIDE) {
         std::string debuggable = property_get("ro.debuggable");
         if (debuggable == "1") {
-            load_properties_from_file(PROP_PATH_LOCAL_OVERRIDE, NULL);
+            load_properties_from_file("/data/local.prop", NULL);
         }
     }
 }
@@ -639,10 +639,10 @@
 }
 
 void load_system_props() {
-    load_properties_from_file(PROP_PATH_SYSTEM_BUILD, NULL);
-    load_properties_from_file(PROP_PATH_ODM_BUILD, NULL);
-    load_properties_from_file(PROP_PATH_VENDOR_BUILD, NULL);
-    load_properties_from_file(PROP_PATH_FACTORY, "ro.*");
+    load_properties_from_file("/system/build.prop", NULL);
+    load_properties_from_file("/odm/build.prop", NULL);
+    load_properties_from_file("/vendor/build.prop", NULL);
+    load_properties_from_file("/factory/factory.prop", "ro.*");
     load_recovery_id_prop();
 }