ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "bionic and init don't need to share knowledge of property file locations."

Browse source 
am: 9cd890e9b7

Change-Id: I5dea4b63c71322d1e5502c3f1a4f449a91b15b71
This commit is contained in:
Elliott Hughes 2017-01-28 16:48:37 +00:00 • committed by android-build-merger
commit 1890bd1b2e
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
init/property_service.cpp
View file

@ -575,16 +575,16 @@ static void load_persistent_properties() {
}
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_recovery_id_prop() {
}
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();
}