openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Remove SkipMountingPartitions from vendor libfstab" am: 437ded4dbd 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1354545

Change-Id: I1c8983d21d3c63566dd6f22a6268bff97f86eaa0
This commit is contained in:
Treehugger Robot 2020-07-03 12:14:27 +00:00 committed by Automerger Merge Worker
parent 5879334b0e 437ded4dbd
commit 52feb83b51
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fs_mgr/Android.bp
View File

@ -149,6 +149,14 @@ cc_library_static {
darwin: {
enabled: false,
},
vendor: {
cflags: [
// Skipping entries in fstab should only be done in a system
// process as the config file is in /system_ext.
// Remove the op from the vendor variant.
"-DNO_SKIP_MOUNT",
],
},
},
export_include_dirs: ["include_fstab"],
header_libs: [

6
fs_mgr/fs_mgr_fstab.cpp
View File

@ -696,7 +696,9 @@ bool ReadFstabFromFile(const std::string& path, Fstab* fstab) {
TransformFstabForDsu(fstab, Split(lp_names, ","));
}
#ifndef NO_SKIP_MOUNT
SkipMountingPartitions(fstab);
#endif
EnableMandatoryFlags(fstab);
return true;
@ -726,11 +728,14 @@ bool ReadFstabFromDt(Fstab* fstab, bool log) {
return false;
}
#ifndef NO_SKIP_MOUNT
SkipMountingPartitions(fstab);
#endif
return true;
}
#ifndef NO_SKIP_MOUNT
// For GSI to skip mounting /product and /system_ext, until there are well-defined interfaces
// between them and /system. Otherwise, the GSI flashed on /system might not be able to work with
// device-specific /product and /system_ext. skip_mount.cfg belongs to system_ext partition because
@ -762,6 +767,7 @@ bool SkipMountingPartitions(Fstab* fstab) {
return true;
}
#endif
// Loads the fstab file and combines with fstab entries passed in from device tree.
bool ReadDefaultFstab(Fstab* fstab) {