[PATCH 2/2] Use /data/data/$procname/$procname.trace on Android

[Alexander Monakov]

diff --git a/Dalvik.markdown b/Dalvik.markdown
index add4860..df419b6 100644
--- a/Dalvik.markdown
+++ b/Dalvik.markdown
@@ -34,12 +34,10 @@ use `-S` flag to `am start`:
     adb shell am start -S $PROCNAME
 
 Use `adb logcat \*:S apitrace` to examine apitrace debug output.  Trace files
-are saved into '/data/' directory by default:
+are saved into '/data/data/$PROCNAME' directory by default:
 
-    adb pull /data/$PROCNAME.trace
-    adb shell rm /data/$PROCNAME.trace
-
-(you need to `chmod 0777 /data` beforehand).
+    adb pull /data/data/$PROCNAME/$PROCNAME.trace
+    adb shell rm /data/data/$PROCNAME/$PROCNAME.trace
 
 
 Injecting tracing library globally
diff --git a/common/trace_writer_local.cpp b/common/trace_writer_local.cpp
index c5a5c44..cda078b 100644
--- a/common/trace_writer_local.cpp
+++ b/common/trace_writer_local.cpp
@@ -94,7 +94,8 @@ LocalWriter::open(void) {
         process.trimDirectory();
 
 #ifdef ANDROID
-	os::String prefix = "/data";
+	os::String prefix = "/data/data";
+	prefix.join(process);
 #else
 	os::String prefix = os::getCurrentDir();
 #endif
-- 
1.8.2.1