Merge "Lock to GCC for all architectures."
diff --git a/src/tools/perf/Android.mk b/src/tools/perf/Android.mk
index 4330a07..0b81231 100644
--- a/src/tools/perf/Android.mk
+++ b/src/tools/perf/Android.mk
@@ -221,11 +221,13 @@
-DNO_LIBAUDIT \
include $(CLEAR_VARS)
-ifeq ($(TARGET_ARCH),arm)
+
# b/17167262, builtin-report.c and builtin-top.c have undefined __aeabi_read_tp
# when compiled with clang -fpie.
+#
+# Aside from that, this code is not -Wreturn-type safe. Rather than rewriting
+# the bison generated code, just use GCC.
LOCAL_CLANG := false
-endif
LOCAL_SRC_FILES := $(perf_src_files)
LOCAL_SRC_FILES_x86 := $(perf_src_files_x86)