commit 75b7171fcb1a8f898ba533011ccb813792932e4c
author Elliott Hughes <enh@google.com> Tue Jul 08 21:33:37 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jul 08 18:09:01 2014 +0000
tree 9fd8c4c775b43aee303899f02a082d6b41ca2fc7
parent ab98d2e6a9392e0481dc9cf246b378072d37e95b
parent 300d5649800744b3f5eab478f2bd7921f584b07d

Merge "Make sdcard log to the log rather than stderr."

debuggerd/tombstone.cpp

diff --git a/debuggerd/tombstone.cpp b/debuggerd/tombstone.cpp
index 2bb9efd..f41166b 100755
--- a/debuggerd/tombstone.cpp
+++ b/debuggerd/tombstone.cpp
@@ -329,7 +329,7 @@
 }
 
 static void dump_map(log_t* log, const backtrace_map_t* map, bool fault_addr) {
-  _LOG(log, logtype::MAPS, "%s%" PRIPTR "-%" PRIPTR " %c%c%c  %7d  %s\n",
+  _LOG(log, logtype::MAPS, "%s%" PRIPTR "-%" PRIPTR " %c%c%c  %7" PRIdPTR "  %s\n",
          (fault_addr? "--->" : "    "), map->start, map->end - 1,
          (map->flags & PROT_READ) ? 'r' : '-', (map->flags & PROT_WRITE) ? 'w' : '-',
          (map->flags & PROT_EXEC) ? 'x' : '-',

rootdir/init.rc

diff --git a/rootdir/init.rc b/rootdir/init.rc
index 62598a0..a983f29 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -251,6 +251,7 @@
     mkdir /data/misc/bluetooth 0770 system system
     mkdir /data/misc/keystore 0700 keystore keystore
     mkdir /data/misc/keychain 0771 system system
+    mkdir /data/misc/net 0750 root shell
     mkdir /data/misc/radio 0770 system radio
     mkdir /data/misc/sms 0770 system radio
     mkdir /data/misc/zoneinfo 0775 system system