From 891a0113941136544509886c1638d973a6c9773c Mon Sep 17 00:00:00 2001
From: Gerry Fan <gfan@google.com>
Date: Thu, 11 Jul 2019 20:44:58 +0000
Subject: [PATCH] Revert "rootdir / sdcard : Stop creating /data/media/obb."

This reverts commit c6ca823710d49754c3717e9cf3ba11b9c2648825.
Reason for revert: Q-GSI on Pie devices would crash kernel.

Bug: 136199978

Change-Id: I16a2cb81a1f21627db0cb00324679a322ba42fe0
---
 rootdir/init.rc   | 1 +
 sdcard/sdcard.cpp | 9 +--------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/rootdir/init.rc b/rootdir/init.rc
index 260199794..1b7367c46 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -586,6 +586,7 @@ on post-fs-data
     symlink /data/data /data/user/0
 
     mkdir /data/media 0770 media_rw media_rw
+    mkdir /data/media/obb 0770 media_rw media_rw
 
     mkdir /data/cache 0770 system cache
     mkdir /data/cache/recovery 0770 system cache
diff --git a/sdcard/sdcard.cpp b/sdcard/sdcard.cpp
index 0acea7266..2b358197a 100644
--- a/sdcard/sdcard.cpp
+++ b/sdcard/sdcard.cpp
@@ -214,14 +214,7 @@ static void run_sdcardfs(const std::string& source_path, const std::string& labe
 
     if (multi_user) {
         std::string obb_path = source_path + "/obb";
-        // Only attempt to prepare the /obb dir if it already exists. We want
-        // the legacy obb path "/data/media/obb" to be fixed up so that we can
-        // migrate it to its new location, but we don't want the directory to be
-        // created if it doesn't already exist.
-        struct stat sb;
-        if (TEMP_FAILURE_RETRY(lstat(obb_path.c_str(), &sb)) == 0) {
-            fs_prepare_dir(obb_path.c_str(), 0775, uid, gid);
-        }
+        fs_prepare_dir(obb_path.c_str(), 0775, uid, gid);
     }
 
     exit(0);