Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 57337e77 authored by Jaekyun Seok's avatar Jaekyun Seok Committed by android-build-merger
Browse files

Merge "Load default/build props from each partition" 

am: 8dbab358

Change-Id: Id2330e53018b7e9638383eda697db7550b1a8324
parents 5675b05f 8dbab358

init/property_service.cpp

+3 −0
Original line number Diff line number Diff line
@@ -439,6 +439,8 @@ 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);

}



static void load_override_properties() {
@@ -501,6 +503,7 @@ 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_recovery_id_prop();

libcutils/fs_config.c

+3 −0
Original line number Diff line number Diff line
@@ -197,7 +197,10 @@ static const struct fs_path_config android_files[] = { 
    { 00640, AID_ROOT,      AID_SHELL,     0, "fstab.*" },

    { 00600, AID_ROOT,      AID_ROOT,      0, "system/build.prop" },

    { 00600, AID_ROOT,      AID_ROOT,      0, "vendor/build.prop" },

    { 00600, AID_ROOT,      AID_ROOT,      0, "odm/build.prop" },

    { 00600, AID_ROOT,      AID_ROOT,      0, "default.prop" },

    { 00600, AID_ROOT,      AID_ROOT,      0, "vendor/default.prop" },

    { 00600, AID_ROOT,      AID_ROOT,      0, "odm/default.prop" },

    { 00644, AID_ROOT,      AID_ROOT,      0, 0 },

};