Merge "10x printf speedup."
diff --git a/README.md b/README.md
index 7114015..f0be759 100644
--- a/README.md
+++ b/README.md
@@ -211,13 +211,13 @@
$ mma # In $ANDROID_ROOT/bionic.
$ adb root && adb remount && adb sync
- $ adb shell /data/nativetest/bionic-unit-tests/bionic-unit-tests32
+ $ adb shell /data/nativetest/bionic-unit-tests/bionic-unit-tests
$ adb shell \
- /data/nativetest/bionic-unit-tests-static/bionic-unit-tests-static32
+ /data/nativetest/bionic-unit-tests-static/bionic-unit-tests-static
# Only for 64-bit targets
- $ adb shell /data/nativetest64/bionic-unit-tests/bionic-unit-tests64
+ $ adb shell /data/nativetest64/bionic-unit-tests/bionic-unit-tests
$ adb shell \
- /data/nativetest64/bionic-unit-tests-static/bionic-unit-tests-static64
+ /data/nativetest64/bionic-unit-tests-static/bionic-unit-tests-static
Note that we use our own custom gtest runner that offers a superset of the
options documented at
@@ -286,7 +286,7 @@
$ adb shell \
GCOV_PREFIX=/data/local/tmp/gcov \
GCOV_PREFIX_STRIP=`echo $ANDROID_BUILD_TOP | grep -o / | wc -l` \
- /data/nativetest/bionic-unit-tests/bionic-unit-tests32
+ /data/nativetest/bionic-unit-tests/bionic-unit-tests
$ acov
`acov` will pull all coverage information from the device, push it to the right
diff --git a/libc/Android.bp b/libc/Android.bp
index 27e90be..0216b55 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -2199,22 +2199,6 @@
}
ndk_headers {
- name: "libc_asm_mips",
- from: "kernel/uapi/asm-mips",
- to: "mipsel-linux-android",
- srcs: ["kernel/uapi/asm-mips/**/*.h"],
- license: "NOTICE",
-}
-
-ndk_headers {
- name: "libc_asm_mips64",
- from: "kernel/uapi/asm-mips",
- to: "mips64el-linux-android",
- srcs: ["kernel/uapi/asm-mips/**/*.h"],
- license: "NOTICE",
-}
-
-ndk_headers {
name: "libc_asm_x86",
from: "kernel/uapi/asm-x86",
to: "i686-linux-android",