| Revision | 5aa0e4241029c80617a8e98b07f7f48ab6b3a3d7 (tree) |
|---|---|
| Time | 2019-07-16 11:56:34 |
| Author | android-build-team Robot <android-build-team-robot@goog...> |
| Commiter | android-build-team Robot |
Merge cherrypicks of [8662136, 8662137, 8660337, 8660601, 8660073, 8660074, 8660602, 8662138, 8660127] into qt-release
Change-Id: I1b633749a669e778f4bac2ac01df0811b5cef7ac
rootdir/init.rc (diff)
sdcard/sdcard.cpp (diff)| @@ -589,6 +589,7 @@ on post-fs-data | ||
| 589 | 589 | symlink /data/data /data/user/0 |
| 590 | 590 | |
| 591 | 591 | mkdir /data/media 0770 media_rw media_rw |
| 592 | + mkdir /data/media/obb 0770 media_rw media_rw | |
| 592 | 593 | |
| 593 | 594 | mkdir /data/cache 0770 system cache |
| 594 | 595 | mkdir /data/cache/recovery 0770 system cache |
| @@ -214,14 +214,7 @@ static void run_sdcardfs(const std::string& source_path, const std::string& labe | ||
| 214 | 214 | |
| 215 | 215 | if (multi_user) { |
| 216 | 216 | std::string obb_path = source_path + "/obb"; |
| 217 | - // Only attempt to prepare the /obb dir if it already exists. We want | |
| 218 | - // the legacy obb path "/data/media/obb" to be fixed up so that we can | |
| 219 | - // migrate it to its new location, but we don't want the directory to be | |
| 220 | - // created if it doesn't already exist. | |
| 221 | - struct stat sb; | |
| 222 | - if (TEMP_FAILURE_RETRY(lstat(obb_path.c_str(), &sb)) == 0) { | |
| 223 | - fs_prepare_dir(obb_path.c_str(), 0775, uid, gid); | |
| 224 | - } | |
| 217 | + fs_prepare_dir(obb_path.c_str(), 0775, uid, gid); | |
| 225 | 218 | } |
| 226 | 219 | |
| 227 | 220 | exit(0); |
Android-x86
Fork