commit 9d461e3080375a701c61b29d1901928e7272f4df
author Jeff Brown <jeffbrown@google.com> Fri Apr 26 18:31:05 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Apr 26 18:31:05 2013 +0000
tree a9749786b26043c916b6f2f439009d25650dee1a
parent 2dc245b9cb1a3ef52d38d704776fe3a9942b6af1
parent fcf2a113870ab61ee76ab372740a3220a9bba995

Merge "Add v7 support libs to path map." into jb-mr2-dev

core/config.mk

diff --git a/core/config.mk b/core/config.mk
index 1be3be0..e7ee49f 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -322,12 +322,7 @@
 FINDBUGS := prebuilt/common/findbugs/bin/findbugs
 EMMA_JAR := external/emma/lib/emma$(COMMON_JAVA_PACKAGE_SUFFIX)
 
-# Deal with archaic version of bison on Mac OS X.
-ifeq ($(filter 1.28,$(shell $(YACC) -V)),)
 YACC_HEADER_SUFFIX:= .hpp
-else
-YACC_HEADER_SUFFIX:= .cpp.h
-endif
 
 # Don't use column under Windows, cygwin or not
 ifeq ($(HOST_OS),windows)