commit b4f2112fa99dab401cd65db4c524d95b1e97614e
author Elliott Hughes <enh@google.com> Wed Aug 12 02:28:25 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Aug 12 02:28:25 2015 +0000
tree 949f8f07942e2dd938135c03e8ebac8c6d028bf8
parent f2985ed840af2d5572fafb03074f17afa516d967
parent 61d9ae5ab15862484a3d9654b426e637781436e9

Merge "[MIPS] Invalidate cached pid in vfork."

README.md

diff --git a/README.md b/README.md
index 79bb72a..72b7124 100644
--- a/README.md
+++ b/README.md
@@ -194,14 +194,15 @@
 ### Device tests
 
     $ mma
+    $ adb remount
     $ adb sync
     $ adb shell /data/nativetest/bionic-unit-tests/bionic-unit-tests32
     $ adb shell \
         /data/nativetest/bionic-unit-tests-static/bionic-unit-tests-static32
     # Only for 64-bit targets
-    $ adb shell /data/nativetest/bionic-unit-tests/bionic-unit-tests64
+    $ adb shell /data/nativetest64/bionic-unit-tests/bionic-unit-tests64
     $ adb shell \
-        /data/nativetest/bionic-unit-tests-static/bionic-unit-tests-static64
+        /data/nativetest64/bionic-unit-tests-static/bionic-unit-tests-static64
 
 ### Host tests
 

benchmarks/time_benchmark.cpp

diff --git a/benchmarks/time_benchmark.cpp b/benchmarks/time_benchmark.cpp
index 6688bbc..1b0d08d 100644
--- a/benchmarks/time_benchmark.cpp
+++ b/benchmarks/time_benchmark.cpp
@@ -17,6 +17,7 @@
 #include <sys/syscall.h>
 #include <sys/time.h>
 #include <time.h>
+#include <unistd.h>
 
 #include <benchmark/Benchmark.h>