Switch to prebuilt bison
Now we have prebuilt bison 2.7 for both Linux and Mac OS X.
We don't need the LOCAL_BISON or LOCAL_YACC any more.
Bug: 8517572
Change-Id: I11319b7e154bbfe6355c98bd1d7f5f22ed727f85
diff --git a/Android.mk b/Android.mk
index ecff19e..693b88d 100644
--- a/Android.mk
+++ b/Android.mk
@@ -42,6 +42,19 @@
ENABLE_AUTOFILL = true
endif
+# Custom y-to-cpp rule
+define webkit-transform-y-to-cpp
+@mkdir -p $(dir $@)
+@echo "WebCore Yacc: $(PRIVATE_MODULE) <= $<"
+$(hide) $(YACC) $(PRIVATE_YACCFLAGS) -o $@ $<
+@touch $(@:$1=$(YACC_HEADER_SUFFIX))
+@echo '#ifndef '$(@F:$1=_h) > $(@:$1=.h)
+@echo '#define '$(@F:$1=_h) >> $(@:$1=.h)
+@cat $(@:$1=$(YACC_HEADER_SUFFIX)) >> $(@:$1=.h)
+@echo '#endif' >> $(@:$1=.h)
+@rm -f $(@:$1=$(YACC_HEADER_SUFFIX))
+endef
+
BASE_PATH := $(call my-dir)
include $(CLEAR_VARS)
@@ -53,8 +66,6 @@
# Using := here prevents recursive expansion
WEBKIT_SRC_FILES :=
-# We have to use bison 2.3
-include $(BASE_PATH)/bison_check.mk
SOURCE_PATH := $(BASE_PATH)/Source
WEBCORE_PATH := $(SOURCE_PATH)/WebCore
diff --git a/Source/WebCore/Android.derived.mk b/Source/WebCore/Android.derived.mk
index 4c0a7ca..6d05dea 100644
--- a/Source/WebCore/Android.derived.mk
+++ b/Source/WebCore/Android.derived.mk
@@ -128,8 +128,7 @@
GEN := $(intermediates)/CSSGrammar.cpp
$(GEN) : PRIVATE_YACCFLAGS := -p cssyy
$(GEN): $(LOCAL_PATH)/css/CSSGrammar.y
- $(call local-transform-y-to-cpp,.cpp)
-$(GEN): $(LOCAL_BISON)
+ $(call webkit-transform-y-to-cpp,.cpp)
LOCAL_GENERATED_SOURCES += $(GEN)
@@ -138,8 +137,7 @@
GEN := $(intermediates)/XPathGrammar.cpp
$(GEN) : PRIVATE_YACCFLAGS := -p xpathyy
$(GEN): $(LOCAL_PATH)/xml/XPathGrammar.y
- $(call local-transform-y-to-cpp,.cpp)
-$(GEN): $(LOCAL_BISON)
+ $(call webkit-transform-y-to-cpp,.cpp)
LOCAL_GENERATED_SOURCES += $(GEN)
# user agent style sheets
diff --git a/bison_check.mk b/bison_check.mk
deleted file mode 100644
index 8a72fac..0000000
--- a/bison_check.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-##
-##
-## Copyright 2008 The Android Open Source Project
-##
-
-ifeq ($(HOST_OS),linux)
-LOCAL_BISON := $(HOST_OUT_EXECUTABLES)/bison$(HOST_EXECUTABLES_SUFFIX)
-LOCAL_YACC := $(LOCAL_BISON) -d
-else
-LOCAL_YACC := $(YACC)
-endif
-
-define local-transform-y-to-cpp
-@mkdir -p $(dir $@)
-@echo "WebCore Yacc: $(PRIVATE_MODULE) <= $<"
-@$(LOCAL_YACC) $(PRIVATE_YACCFLAGS) -o $@ $<
-@touch $(@:$1=$(YACC_HEADER_SUFFIX))
-@echo '#ifndef '$(@F:$1=_h) > $(@:$1=.h)
-@echo '#define '$(@F:$1=_h) >> $(@:$1=.h)
-@cat $(@:$1=$(YACC_HEADER_SUFFIX)) >> $(@:$1=.h)
-@echo '#endif' >> $(@:$1=.h)
-@rm -f $(@:$1=$(YACC_HEADER_SUFFIX))
-endef
-
