diff options
| author | Ying Wang <wangying@google.com> | 2013-04-06 02:51:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-04-06 02:51:55 +0000 |
| commit | 11d7657ebc4dfb1462db8cdc8b48ffa25478e442 (patch) | |
| tree | 39c236128640e750619b2d0e3808690f70e4a3a1 | |
| parent | a8614adaf3a38d693c9715bfe5addada00b41da6 (diff) | |
| parent | 46946b1b4c43c11cff722dc40fa5ef759a7e14e5 (diff) | |
| download | webkit-11d7657ebc4dfb1462db8cdc8b48ffa25478e442.tar.gz | |
Merge "Switch to prebuilt bison"tools_r22
| -rw-r--r-- | Android.mk | 15 | ||||
| -rw-r--r-- | Source/WebCore/Android.derived.mk | 6 | ||||
| -rw-r--r-- | bison_check.mk | 24 |
3 files changed, 15 insertions, 30 deletions
diff --git a/Android.mk b/Android.mk index ecff19e54..693b88d85 100644 --- a/Android.mk +++ b/Android.mk @@ -42,6 +42,19 @@ ifneq ($(ENABLE_AUTOFILL),false) 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 @@ base_intermediates := $(call local-intermediates-dir) # 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 4c0a7ca5f..6d05deaee 100644 --- a/Source/WebCore/Android.derived.mk +++ b/Source/WebCore/Android.derived.mk @@ -128,8 +128,7 @@ $(intermediates)/css/CSSParser.o : $(GEN) 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 @@ LOCAL_GENERATED_SOURCES += $(GEN) 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 8a72facc9..000000000 --- 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 - |