commit d1846d15016a8d9e2cf33d2f7e4451ddc3adad85
author Tom Cherry <tomcherry@google.com> Wed May 03 23:54:23 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed May 03 23:54:23 2017 +0000
tree ad7b33e36bced7f4d0ad693e29797f058049a248
parent eaf8dbbc5a3813ee8bf3ea889d8d428931829f46
parent 170a4faf4f8fd46c12d69915af168cba3664b503

Merge "Make /data/data a symlink to /data/user/0" am: 49bbe16447 am: c43da33005
am: f95686e0cf

Change-Id: I081704dc6d7d60edaca979f6af2b1c4418ebc844

rootdir/init.rc

diff --git a/rootdir/init.rc b/rootdir/init.rc
index def686b..acb0557 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -422,7 +422,6 @@
     # 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
@@ -475,7 +474,8 @@
 
     mkdir /data/user 0711 system system
     mkdir /data/user_de 0711 system system
-    symlink /data/data /data/user/0
+    mkdir /data/user/0 0711 system system
+    symlink /data/user/0 /data/data
 
     mkdir /data/media 0770 media_rw media_rw
     mkdir /data/media/obb 0770 media_rw media_rw