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

Commit 6b5913a8 authored by Mark Salyzyn's avatar Mark Salyzyn Committed by android-build-merger
Browse files

Merge "libcutils: fs_config() add check /oem/etc/fs_config_*" 

am: c5300458

Change-Id: Idbe297f1402adb73bfa6e7bf82c39a0214752178
parents 12231042 c5300458

libcutils/fs_config.c

+12 −7
Original line number Diff line number Diff line
@@ -112,17 +112,20 @@ static const struct fs_path_config android_dirs[] = { 
*/

static const char sys_conf_dir[] = "/system/etc/fs_config_dirs";

static const char sys_conf_file[] = "/system/etc/fs_config_files";

/* No restrictions are placed on the vendor file-system config files,

 * although the developer is advised to restrict the scope to the /vendor

 * file-system since the intent is to provide support for customized

 * portions of a separate vendor.img.  Has to remain open so that

 * customization can also land on /system/vendor.  We expect build-time

 * checking or filtering when constructing /vendor/etc/fs_config_* files.

/* No restrictions are placed on the vendor and oem file-system config files,

 * although the developer is advised to restrict the scope to the /vendor or

 * oem/ file-system since the intent is to provide support for customized

 * portions of a separate vendor.img or oem.img.  Has to remain open so that

 * customization can also land on /system/vendor or /system/orm.  We expect

 * build-time checking or filtering when constructing the associated

 * fs_config_* files.

 */

static const char ven_conf_dir[] = "/vendor/etc/fs_config_dirs";

static const char ven_conf_file[] = "/vendor/etc/fs_config_files";

static const char oem_conf_dir[] = "/oem/etc/fs_config_dirs";

static const char oem_conf_file[] = "/oem/etc/fs_config_files";

static const char* conf[][2] = {

    {sys_conf_file, sys_conf_dir}, {ven_conf_file, ven_conf_dir},

    {sys_conf_file, sys_conf_dir}, {ven_conf_file, ven_conf_dir}, {oem_conf_file, oem_conf_dir},

};



static const struct fs_path_config android_files[] = {
@@ -139,6 +142,8 @@ static const struct fs_path_config android_files[] = { 
    { 00600, AID_ROOT,      AID_ROOT,      0, "default.prop" },

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

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

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

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

    { 00750, AID_ROOT,      AID_SHELL,     0, "sbin/fs_mgr" },

    { 00755, AID_ROOT,      AID_SHELL,     0, "system/bin/crash_dump32" },

    { 00755, AID_ROOT,      AID_SHELL,     0, "system/bin/crash_dump64" },