commit a6f075c85bef7ea89951c54b7f5bbe8d771f8004
author Tom Cherry <tomcherry@google.com> Fri May 05 17:42:37 2017 +0000
committer Tom Cherry <tomcherry@google.com> Mon May 08 16:06:38 2017 +0000
tree 44c364cc6a7929a386ef2fc7b92a9e927d3050da
parent 32d015c38db5ff8d9f4d964a988c3dc28b8450c9

Revert "Make /data/data a symlink to /data/user/0"

This reverts commit d147cb5887f1ee9c978f58cdf59e9ddb99209ac6.

Original change breaks AVD
Original changes breaks SF/AF
Bug: 38026755
Bug: 38030346
Bug: 38114264

Change-Id: Iab56244f0dc0f6b0df2916c691277a882fc7d184

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