commit 4697a5ddba3df1036ba349a4a98fd1a2df9ba6ee
author Dan Albert <danalbert@google.com> Mon Jun 15 10:53:23 2015 -0700
committer Dan Albert <danalbert@google.com> Mon Jun 15 10:53:23 2015 -0700
tree ffd98f7ee70e6dfb66bcf492b1665a74f06181bb
parent 77006d8a6973d6e73b6843c5f09f879f2ee42569

Lock to GCC for all architectures.

Bug: http://b/21846197
Change-Id: Ia2607e2055ac847265f4d28522db6719e635eb2d

src/tools/perf/Android.mk

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)