commit 4aeb1b1b0ad9355f53fdd0c89e03872a3f2ef27b
author Tom Cherry <tomcherry@google.com> Mon May 08 22:58:05 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon May 08 22:58:05 2017 +0000
tree 06aeddae4827daaea645d130e389fa431a655238
parent 9d846d0c22e44381bd5e4bd75f4a1f0f35279010
parent f7f24c4c781c1549d8af78f6c9af41776dc3b308

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

Change-Id: I9057d2ee58e3f99e422ac1a203bd219e7f552ba0

rootdir/init.rc

diff --git a/rootdir/init.rc b/rootdir/init.rc
index acb0557..def686b 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -422,6 +422,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
@@ -474,8 +475,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