commit c43da330056632b741e73a4e4ca34a32873927d7
author Tom Cherry <tomcherry@google.com> Wed May 03 23:46:50 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed May 03 23:46:50 2017 +0000
tree 30e9ecc78abf00ad427bf260136fe9a0236aa5f7
parent 0c91897714bf6f6ca63f7e6b9a78d9822b25776b
parent 49bbe16447189c4e06d033cd7bc9704d2a717a16

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

Change-Id: I3af2449abd0b1bb4d839d7a17239fe574ed2e88c

rootdir/init.rc

diff --git a/rootdir/init.rc b/rootdir/init.rc
index 540e976..8cdc13f 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -419,7 +419,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
@@ -472,7 +471,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