From 3b523b87218c05c8dd49c191e3d5a7a114907e82 Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Tue, 24 May 2011 14:09:24 +0100 Subject: Merge WebKit at r80534: Fix makefiles. Add new and remove deleted files to fix makefiles. See http://trac.webkit.org/changeset/79861 for new XSLTreeViewer generation. Also remove a stub from TemporaryLInkStubs that we now get by compiling the correct files in JSC (see http://trac.webkit.org/changeset/78634). Change-Id: I550b035b7c9c915b42738366da7817dca020c9a8 --- Android.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'Android.mk') diff --git a/Android.mk b/Android.mk index acc102c..f79cb95 100644 --- a/Android.mk +++ b/Android.mk @@ -238,6 +238,7 @@ LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \ LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \ $(JAVASCRIPTCORE_PATH) \ + $(JAVASCRIPTCORE_PATH)/collector/handles \ $(JAVASCRIPTCORE_PATH)/wtf \ $(JAVASCRIPTCORE_PATH)/wtf/unicode \ $(JAVASCRIPTCORE_PATH)/wtf/unicode/icu @@ -246,7 +247,8 @@ LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \ $(WEBCORE_INTERMEDIATES_PATH) \ $(WEBCORE_INTERMEDIATES_PATH)/css \ $(WEBCORE_INTERMEDIATES_PATH)/html \ - $(WEBCORE_INTERMEDIATES_PATH)/platform + $(WEBCORE_INTERMEDIATES_PATH)/platform \ + $(WEBCORE_INTERMEDIATES_PATH)/xml # The following includes are needed by the AutoFill feature, or the chrome http # stack -- cgit v1.1