summaryrefslogtreecommitdiffstats
path: root/WebCore
diff options
context:
space:
mode:
Diffstat (limited to 'WebCore')
-rw-r--r--WebCore/Android.derived.mk11
-rw-r--r--WebCore/Android.mk1
2 files changed, 6 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)
diff --git a/WebCore/Android.mk b/WebCore/Android.mk
index 492daeb..ca8c31f 100644
--- a/WebCore/Android.mk
+++ b/WebCore/Android.mk
@@ -278,6 +278,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
html/FileThread.cpp \
html/FormDataList.cpp \
html/HTMLEntityParser.cpp \
+ html/HTMLEntitySearch.cpp \
html/HTMLTokenizer.cpp \
html/HTMLPreloadScanner.cpp \
html/HTMLScriptRunner.cpp \