| Revision | 1dc09b5d8f5f0a4b4ac72fb31b76ab61716f9e13 (tree) |
|---|---|
| Time | 2017-11-30 16:51:28 |
| Author | Chih-Wei Huang <cwhuang@linu...> |
| Commiter | Chih-Wei Huang |
Fix ext4/f2fs can't be mounted issue
Android.mk (diff)
fs/Ext4.cpp (diff) fs/F2fs.cpp (diff)| @@ -75,6 +75,7 @@ common_static_libraries := \ | ||
| 75 | 75 | |
| 76 | 76 | vold_conlyflags := -std=c11 |
| 77 | 77 | vold_cflags := -Werror -Wall -Wno-missing-field-initializers -Wno-unused-variable -Wno-unused-parameter |
| 78 | +vold_cflags += $(if $(LINEAGE_BUILD),-DLINEAGE_BUILD) | |
| 78 | 79 | |
| 79 | 80 | required_modules := |
| 80 | 81 | ifeq ($(TARGET_USERIMAGES_USE_EXT4), true) |
| @@ -136,12 +136,14 @@ status_t Mount(const std::string& source, const std::string& target, bool ro, | ||
| 136 | 136 | |
| 137 | 137 | std::string data(opts); |
| 138 | 138 | |
| 139 | +#ifdef LINEAGE_BUILD | |
| 139 | 140 | if (portable) { |
| 140 | 141 | if (!data.empty()) { |
| 141 | 142 | data += ","; |
| 142 | 143 | } |
| 143 | 144 | data += "context=u:object_r:sdcard_posix:s0"; |
| 144 | 145 | } |
| 146 | +#endif | |
| 145 | 147 | const char* c_source = source.c_str(); |
| 146 | 148 | const char* c_target = target.c_str(); |
| 147 | 149 | const char* c_data = data.c_str(); |
| @@ -53,12 +53,14 @@ status_t Mount(const std::string& source, const std::string& target, const std:: | ||
| 53 | 53 | |
| 54 | 54 | std::string data(opts); |
| 55 | 55 | |
| 56 | +#ifdef LINEAGE_BUILD | |
| 56 | 57 | if (portable) { |
| 57 | 58 | if (!data.empty()) { |
| 58 | 59 | data += ","; |
| 59 | 60 | } |
| 60 | 61 | data += "context=u:object_r:sdcard_posix:s0"; |
| 61 | 62 | } |
| 63 | +#endif | |
| 62 | 64 | |
| 63 | 65 | const char* c_source = source.c_str(); |
| 64 | 66 | const char* c_target = target.c_str(); |
Android-x86
Fork