summaryrefslogtreecommitdiffstats
path: root/WebCore/Android.derived.mk
diff options
context:
space:
mode:
authorIain Merrick <husky@google.com>2010-08-20 11:58:21 +0100
committerIain Merrick <husky@google.com>2010-08-23 15:16:07 +0100
commit5fad69d9971b460f791574bbb29b3b3217b406e7 (patch)
tree73eb2d668ef22d44a3ef82ba26d087c1b162030a /WebCore/Android.derived.mk
parent4b6c4a5ffee885cdceb3df7cb2b8a14a80359bc6 (diff)
downloadexternal_webkit-5fad69d9971b460f791574bbb29b3b3217b406e7.zip
external_webkit-5fad69d9971b460f791574bbb29b3b3217b406e7.tar.gz
external_webkit-5fad69d9971b460f791574bbb29b3b3217b406e7.tar.bz2
Merge WebKit at r65615 : Fix Makefiles.
WebkitTools/Scripts/create-html-entity-table was added in http://trac.webkit.org/changeset/65351. Change-Id: Iff5c7aaa13e79f3666ef4176ca12d284c985b005
Diffstat (limited to 'WebCore/Android.derived.mk')
-rw-r--r--WebCore/Android.derived.mk11
1 files changed, 5 insertions, 6 deletions
diff --git a/WebCore/Android.derived.mk b/WebCore/Android.derived.mk
index 2111e6e..821d3a2 100644
--- a/WebCore/Android.derived.mk
+++ b/WebCore/Android.derived.mk
@@ -67,14 +67,13 @@ $(GEN): $(LOCAL_PATH)/html/DocTypeStrings.gperf
$(intermediates)/html/HTMLDocument.o : $(GEN)
-# HTML entity names
+# HTML entity table
-GEN := $(intermediates)/html/HTMLEntityNames.cpp
-$(GEN): SCRIPT := $(LOCAL_PATH)/make-hash-tools.pl
-$(GEN): PRIVATE_CUSTOM_TOOL = perl $(SCRIPT) . $<
-$(GEN): $(LOCAL_PATH)/html/HTMLEntityNames.gperf
+GEN := $(intermediates)/html/HTMLEntityTable.cpp
+$(GEN): SCRIPT := $(LOCAL_PATH)/../WebKitTools/Scripts/create-html-entity-table
+$(GEN): PRIVATE_CUSTOM_TOOL = $(SCRIPT) -o $@ $<
+$(GEN): $(LOCAL_PATH)/html/HTMLEntityNames.json
$(transform-generated-source)
- @mv ./HTMLEntityNames.cpp $@
LOCAL_GENERATED_SOURCES += $(GEN)