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

Commit b36b54cf authored by Bowgo Tsai's avatar Bowgo Tsai Committed by Android (Google) Code Review
Browse files

Merge "Moving /odm/build.prop to /odm/etc/buid.prop" into qt-dev

parents 8ef22b10 3182ea13

init/property_service.cpp

+6 −2
Original line number Original line Diff line number Diff line
@@ -883,8 +883,12 @@ void property_load_boot_defaults(bool load_debug_prop) { 
    load_properties_from_file("/system/build.prop", nullptr, &properties);

    load_properties_from_file("/system/build.prop", nullptr, &properties);

    load_properties_from_file("/vendor/default.prop", nullptr, &properties);

    load_properties_from_file("/vendor/default.prop", nullptr, &properties);

    load_properties_from_file("/vendor/build.prop", nullptr, &properties);

    load_properties_from_file("/vendor/build.prop", nullptr, &properties);

    if (SelinuxGetVendorAndroidVersion() >= __ANDROID_API_Q__) {

        load_properties_from_file("/odm/etc/build.prop", nullptr, &properties);

    } else {

        load_properties_from_file("/odm/default.prop", nullptr, &properties);

        load_properties_from_file("/odm/default.prop", nullptr, &properties);

        load_properties_from_file("/odm/build.prop", nullptr, &properties);

        load_properties_from_file("/odm/build.prop", nullptr, &properties);

    }

    load_properties_from_file("/product/build.prop", nullptr, &properties);

    load_properties_from_file("/product/build.prop", nullptr, &properties);

    load_properties_from_file("/product_services/build.prop", nullptr, &properties);

    load_properties_from_file("/product_services/build.prop", nullptr, &properties);

    load_properties_from_file("/factory/factory.prop", "ro.*", &properties);

    load_properties_from_file("/factory/factory.prop", "ro.*", &properties);

libcutils/fs_config.cpp

+3 −2
Original line number Original line Diff line number Diff line
@@ -159,8 +159,9 @@ static const struct fs_path_config android_files[] = { 
    { 00750, AID_ROOT,      AID_SHELL,     0, "data/nativetest64/*" },

    { 00750, AID_ROOT,      AID_SHELL,     0, "data/nativetest64/*" },

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

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

    { 00600, AID_ROOT,      AID_ROOT,      0, "system/etc/prop.default" },

    { 00600, AID_ROOT,      AID_ROOT,      0, "system/etc/prop.default" },

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

    { 00600, AID_ROOT,      AID_ROOT,      0, "odm/build.prop" }, // legacy; only for P release

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

    { 00600, AID_ROOT,      AID_ROOT,      0, "odm/default.prop" }, // legacy; only for P release

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

    { 00444, AID_ROOT,      AID_ROOT,      0, odm_conf_dir + 1 },

    { 00444, AID_ROOT,      AID_ROOT,      0, odm_conf_dir + 1 },

    { 00444, AID_ROOT,      AID_ROOT,      0, odm_conf_file + 1 },

    { 00444, AID_ROOT,      AID_ROOT,      0, odm_conf_file + 1 },

    { 00444, AID_ROOT,      AID_ROOT,      0, oem_conf_dir + 1 },

    { 00444, AID_ROOT,      AID_ROOT,      0, oem_conf_dir + 1 },