Merge "Add <error.h>."
diff --git a/benchmarks/Android.mk b/benchmarks/Android.mk
index 8f5fd41..989e9e6 100644
--- a/benchmarks/Android.mk
+++ b/benchmarks/Android.mk
@@ -14,8 +14,6 @@
# limitations under the License.
#
-ifneq ($(BUILD_TINY_ANDROID), true)
-
LOCAL_PATH := $(call my-dir)
# -----------------------------------------------------------------------------
@@ -108,5 +106,3 @@
endif
endif
-
-endif # !BUILD_TINY_ANDROID
diff --git a/libc/Android.mk b/libc/Android.mk
index 522d514..a2a3108 100644
--- a/libc/Android.mk
+++ b/libc/Android.mk
@@ -897,7 +897,14 @@
LOCAL_CXX_STL := none
LOCAL_SYSTEM_SHARED_LIBRARIES :=
LOCAL_ADDRESS_SANITIZER := false
-LOCAL_NATIVE_COVERAGE := $(bionic_coverage)
+# b/17574078: Need to disable coverage until we have a prebuilt libprofile_rt.
+# Since this is a static library built with clang, it needs to link
+# libprofile_rt when it is linked into the final binary. Since the final binary
+# is built with GCC, it won't link libprofile_rt. We can't very easily just add
+# libprofile_rt to all link lines the way we've done for libgcov because
+# libprofile_rt isn't prebuilt, and it would be tricky to write a rule that
+# would make sure libprofile_rt is built.
+LOCAL_NATIVE_COVERAGE := false
include $(BUILD_STATIC_LIBRARY)
diff --git a/linker/tests/Android.mk b/linker/tests/Android.mk
index fe64e77..aa9491e 100644
--- a/linker/tests/Android.mk
+++ b/linker/tests/Android.mk
@@ -14,8 +14,6 @@
# limitations under the License.
#
-ifneq ($(BUILD_TINY_ANDROID),true)
-
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
@@ -34,5 +32,3 @@
../linker_allocator.cpp
include $(BUILD_NATIVE_TEST)
-
-endif # !BUILD_TINY_ANDROID
diff --git a/tests/Android.mk b/tests/Android.mk
index 9304d46..82a92f0 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -14,8 +14,6 @@
# limitations under the License.
#
-ifneq ($(BUILD_TINY_ANDROID),true)
-
LOCAL_PATH := $(call my-dir)
# -----------------------------------------------------------------------------
@@ -439,4 +437,3 @@
endif # linux-x86
include $(call first-makefiles-under,$(LOCAL_PATH))
-endif # !BUILD_TINY_ANDROID