diff options
| author | Teng-Hui Zhu <ztenghui@google.com> | 2010-11-11 10:10:30 -0800 |
|---|---|---|
| committer | Teng-Hui Zhu <ztenghui@google.com> | 2010-11-17 13:35:59 -0800 |
| commit | 556c4742cc0b7ecb0226942b7525852f7c0d6508 (patch) | |
| tree | c23665192ff9a6f568b82b12f4f889340e5b7c19 | |
| parent | a884348a07235d658b6337f68cf977cecba570f6 (diff) | |
| download | external_webkit-556c4742cc0b7ecb0226942b7525852f7c0d6508.zip external_webkit-556c4742cc0b7ecb0226942b7525852f7c0d6508.tar.gz external_webkit-556c4742cc0b7ecb0226942b7525852f7c0d6508.tar.bz2 | |
Merge Webkit at r71558: Fix Makefiles
Change-Id: I6e437c61405ca117da435b32a8a933a3aa53ba32
| -rw-r--r-- | Android.mk | 1 | ||||
| -rw-r--r-- | WebCore/Android.mk | 20 | ||||
| -rw-r--r-- | WebCore/Android.v8bindings.mk | 1 |
3 files changed, 14 insertions, 8 deletions
@@ -165,6 +165,7 @@ LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \ $(LOCAL_PATH)/WebCore/loader/appcache \ $(LOCAL_PATH)/WebCore/loader/archive \ $(LOCAL_PATH)/WebCore/loader/archive/android \ + $(LOCAL_PATH)/WebCore/loader/cache \ $(LOCAL_PATH)/WebCore/loader/icon \ $(LOCAL_PATH)/WebCore/notifications \ $(LOCAL_PATH)/WebCore/page \ diff --git a/WebCore/Android.mk b/WebCore/Android.mk index a18edab..8f62856 100644 --- a/WebCore/Android.mk +++ b/WebCore/Android.mk @@ -217,6 +217,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ editing/DeleteFromTextNodeCommand.cpp \ editing/DeleteSelectionCommand.cpp \ editing/EditCommand.cpp \ + editing/EditingStyle.cpp \ editing/Editor.cpp \ editing/EditorCommand.cpp \ editing/FormatBlockCommand.cpp \ @@ -381,6 +382,11 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ html/parser/TextDocumentParser.cpp \ html/parser/TextViewSourceParser.cpp \ \ + inspector/InspectorFileSystemAgent.cpp \ + inspector/ScriptArguments.cpp \ + inspector/ScriptCallFrame.cpp \ + inspector/ScriptCallStack.cpp \ + \ loader/cache/CachedCSSStyleSheet.cpp \ loader/cache/CachedFont.cpp \ loader/cache/CachedImage.cpp \ @@ -1144,6 +1150,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ # For XPath LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ + xml/NativeXPathNSResolver.cpp \ xml/XPathEvaluator.cpp \ xml/XPathExpression.cpp \ xml/XPathExpressionNode.cpp \ @@ -1158,19 +1165,18 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ xml/XPathStep.cpp \ xml/XPathUtil.cpp \ xml/XPathValue.cpp \ - xml/XPathVariableReference.cpp \ - xml/NativeXPathNSResolver.cpp + xml/XPathVariableReference.cpp # For XSLT LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ + loader/cache/CachedXSLStyleSheet.cpp \ + dom/TransformSourceLibxslt.cpp \ + xml/XSLImportRule.cpp \ + xml/XSLStyleSheetLibxslt.cpp \ xml/XSLTExtensions.cpp \ xml/XSLTProcessorLibxslt.cpp \ xml/XSLTProcessor.cpp \ - xml/XSLTUnicodeSort.cpp \ - xml/XSLStyleSheetLibxslt.cpp \ - xml/XSLImportRule.cpp \ - loader/CachedXSLStyleSheet.cpp \ - dom/TransformSourceLibxslt.cpp + xml/XSLTUnicodeSort.cpp # For Archive LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ diff --git a/WebCore/Android.v8bindings.mk b/WebCore/Android.v8bindings.mk index c42f818..79fd72e 100644 --- a/WebCore/Android.v8bindings.mk +++ b/WebCore/Android.v8bindings.mk @@ -55,7 +55,6 @@ LOCAL_SRC_FILES += \ bindings/v8/ScheduledAction.cpp \ bindings/v8/ScopedDOMDataStore.cpp \ bindings/v8/ScriptCachedFrameData.cpp \ - bindings/v8/ScriptArray.cpp \ bindings/v8/ScriptCallStackFactory.cpp \ bindings/v8/ScriptController.cpp \ bindings/v8/ScriptEventListener.cpp \ |