diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-24 14:09:24 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-06-02 09:53:33 +0100 |
| commit | 3b523b87218c05c8dd49c191e3d5a7a114907e82 (patch) | |
| tree | 9cac2418495c9b21220887e2b785d5eb9bae11b3 /Android.mk | |
| parent | 9921f05212aa840e1ce32e9f04fa60ca4b3bcbb7 (diff) | |
| download | external_webkit-3b523b87218c05c8dd49c191e3d5a7a114907e82.zip external_webkit-3b523b87218c05c8dd49c191e3d5a7a114907e82.tar.gz external_webkit-3b523b87218c05c8dd49c191e3d5a7a114907e82.tar.bz2 | |
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
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -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 |