commit e4f35b111e36e00f73028ccdba0822e1690149ce
author Tom Cherry <tomcherry@google.com> Mon May 08 20:56:05 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon May 08 20:56:05 2017 +0000
tree 3ba2f35c4885395db486bb966713d31841b38550
parent 7182f0622347b1b76f20db68133a2e4f8604594c
parent 20a74298a5fe25adb276ef321778878f1c4ef855

Merge "Revert "Make /data/data a symlink to /data/user/0"" am: 823816ee9f
am: 20a74298a5

Change-Id: I0673663db7b20b44867801f146e49235d15baf8a

rootdir/init.rc

diff --git a/rootdir/init.rc b/rootdir/init.rc
index 8cdc13f..540e976 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -419,6 +419,7 @@
     # For security reasons, /data/local/tmp should always be empty.
     # Do not place files or directories in /data/local/tmp
     mkdir /data/local/tmp 0771 shell shell
+    mkdir /data/data 0771 system system
     mkdir /data/app-private 0771 system system
     mkdir /data/app-ephemeral 0771 system system
     mkdir /data/app-asec 0700 root root
@@ -471,8 +472,7 @@
 
     mkdir /data/user 0711 system system
     mkdir /data/user_de 0711 system system
-    mkdir /data/user/0 0711 system system
-    symlink /data/user/0 /data/data
+    symlink /data/data /data/user/0
 
     mkdir /data/media 0770 media_rw media_rw
     mkdir /data/media/obb 0770 media_rw media_rw