commit e3c22c416fb2322d1748f66e3ed2bf6f265a8c68
author Calin Juravle <calin@google.com> Mon Oct 27 15:15:38 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Oct 27 15:15:39 2014 +0000
tree 297f9149f8b3a0a3f212ba379067eaeb7ba329f6
parent d88323b2667c443c2738eb601eb0b9eaad1c3049
parent f9d9e2a2d96559c3165405d572b08e260156074a

Merge "Handle code_cache dir creation in libnativebridge"

debuggerd/crasher.c

diff --git a/debuggerd/crasher.c b/debuggerd/crasher.c
index d315ee5..d0c3912 100644
--- a/debuggerd/crasher.c
+++ b/debuggerd/crasher.c
@@ -59,7 +59,7 @@
     for(;;) {
         usleep(250*1000);
         write(2, &c, 1);
-        if(c == 'C') *((unsigned*) 0) = 42;
+        if(c == 'C') *((volatile unsigned*) 0) = 42;
     }
     return NULL;
 }

libpixelflinger/tests/arch-arm64/assembler/arm64_assembler_test.cpp

diff --git a/libpixelflinger/tests/arch-arm64/assembler/arm64_assembler_test.cpp b/libpixelflinger/tests/arch-arm64/assembler/arm64_assembler_test.cpp
index 456be58..fd96f7e 100644
--- a/libpixelflinger/tests/arch-arm64/assembler/arm64_assembler_test.cpp
+++ b/libpixelflinger/tests/arch-arm64/assembler/arm64_assembler_test.cpp
@@ -409,7 +409,7 @@
 {
     const long base = long(instrMem);
     const long curr = base + long(instrMemSize);
-    __builtin___clear_cache((void*)base, (void*)curr);
+    __builtin___clear_cache((char*)base, (char*)curr);
 }
 void dataOpTest(dataOpTest_t test, ARMAssemblerInterface *a64asm, uint32_t Rd = 0,
                 uint32_t Rn = 1, uint32_t Rm = 2, uint32_t Rs = 3)

rootdir/init.rc

diff --git a/rootdir/init.rc b/rootdir/init.rc
index 11c34f8..503f9ba 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -304,6 +304,8 @@
     # the following directory.
     mkdir /data/mediadrm 0770 mediadrm mediadrm
 
+    mkdir /data/adb 0700 root root
+
     # symlink to bugreport storage location
     symlink /data/data/com.android.shell/files/bugreports /data/bugreports