commit d1d11fcbe55ed7c7d49e857565fb2ec06ad5b54c
author Elliott Hughes <enh@google.com> Fri Aug 29 16:27:22 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Aug 29 16:27:23 2014 +0000
tree f26e7bdd1d54903b791809c8ec6bbd0028a297c0
parent 188d4396b8b02d970a129fbcb869daff38ca9232
parent 660e750b122b546760ade1a792248fc1d2c09b1b

Merge "Build the optional 'r' tool separately."

include/private/android_filesystem_config.h

diff --git a/include/private/android_filesystem_config.h b/include/private/android_filesystem_config.h
index d8e938e..496dabc 100644
--- a/include/private/android_filesystem_config.h
+++ b/include/private/android_filesystem_config.h
@@ -196,7 +196,7 @@
     { 00770, AID_SYSTEM, AID_CACHE,  0, "cache" },
     { 00771, AID_SYSTEM, AID_SYSTEM, 0, "data/app" },
     { 00771, AID_SYSTEM, AID_SYSTEM, 0, "data/app-private" },
-    { 00771, AID_SYSTEM, AID_SYSTEM, 0, "data/dalvik-cache" },
+    { 00771, AID_ROOT,   AID_ROOT,   0, "data/dalvik-cache" },
     { 00771, AID_SYSTEM, AID_SYSTEM, 0, "data/data" },
     { 00771, AID_SHELL,  AID_SHELL,  0, "data/local/tmp" },
     { 00771, AID_SHELL,  AID_SHELL,  0, "data/local" },

rootdir/init.rc

diff --git a/rootdir/init.rc b/rootdir/init.rc
index 3644219..11c34f8 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -285,7 +285,7 @@
     mkdir /data/property 0700 root root
 
     # create dalvik-cache, so as to enforce our permissions
-    mkdir /data/dalvik-cache 0771 system system
+    mkdir /data/dalvik-cache 0771 root root
     mkdir /data/dalvik-cache/profiles 0711 system system
 
     # create resource-cache and double-check the perms