diff options
| author | Ben Murdoch <benm@google.com> | 2010-07-22 16:25:33 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-07-27 10:20:26 +0100 |
| commit | c697ccf5ef26f14b2ab9743e4e2f20e8ec046441 (patch) | |
| tree | 18f488bd7ebefe377eebb51ca8766361916b53f9 /WebCore | |
| parent | 1ffb211e1b85290ba4deec090093a688b26c6082 (diff) | |
| download | external_webkit-c697ccf5ef26f14b2ab9743e4e2f20e8ec046441.zip external_webkit-c697ccf5ef26f14b2ab9743e4e2f20e8ec046441.tar.gz external_webkit-c697ccf5ef26f14b2ab9743e4e2f20e8ec046441.tar.bz2 | |
Merge Webkit at r63859 : Fix Makefiles.
Change-Id: I5a218be0b26003f4fceb964e7add0f1eda410710
Diffstat (limited to 'WebCore')
| -rw-r--r-- | WebCore/Android.derived.jscbindings.mk | 2 | ||||
| -rw-r--r-- | WebCore/Android.derived.v8bindings.mk | 1 | ||||
| -rw-r--r-- | WebCore/Android.jscbindings.mk | 1 | ||||
| -rw-r--r-- | WebCore/Android.mk | 2 |
4 files changed, 5 insertions, 1 deletions
diff --git a/WebCore/Android.derived.jscbindings.mk b/WebCore/Android.derived.jscbindings.mk index a8348f3..e1cd523 100644 --- a/WebCore/Android.derived.jscbindings.mk +++ b/WebCore/Android.derived.jscbindings.mk @@ -605,7 +605,9 @@ $(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/xml/%.cpp : $(intermediates)/xml/ # Inspector # These headers are required even when Inspector is disabled GEN := \ + $(intermediates)/inspector/JSInspector.h \ $(intermediates)/inspector/JSScriptProfile.h + $(GEN): PRIVATE_PATH := $(LOCAL_PATH) $(GEN): PRIVATE_CUSTOM_TOOL = perl -I$(PRIVATE_PATH)/bindings/scripts $(PRIVATE_PATH)/bindings/scripts/generate-bindings.pl --defines "$(FEATURE_DEFINES) LANGUAGE_JAVASCRIPT" --generator JS --include dom --include html --outputdir $(dir $@) $< $(GEN): $(intermediates)/inspector/JS%.h : $(LOCAL_PATH)/inspector/%.idl $(js_binding_scripts) diff --git a/WebCore/Android.derived.v8bindings.mk b/WebCore/Android.derived.v8bindings.mk index d71482b..6072766 100644 --- a/WebCore/Android.derived.v8bindings.mk +++ b/WebCore/Android.derived.v8bindings.mk @@ -612,6 +612,7 @@ $(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/bindings/%.cpp : $(intermediates) # These headers are required by the V8 bindings even when Inspector is disabled GEN := \ $(intermediates)/bindings/V8InjectedScriptHost.h \ + $(intermediates)/bindings/V8Inspector.h \ $(intermediates)/bindings/V8InspectorBackend.h \ $(intermediates)/bindings/V8InspectorFrontendHost.h \ $(intermediates)/bindings/V8ScriptProfile.h diff --git a/WebCore/Android.jscbindings.mk b/WebCore/Android.jscbindings.mk index 2b720b1..d904f64 100644 --- a/WebCore/Android.jscbindings.mk +++ b/WebCore/Android.jscbindings.mk @@ -93,7 +93,6 @@ LOCAL_SRC_FILES += \ bindings/js/JSDOMWindowCustom.cpp \ bindings/js/JSDOMWindowShell.cpp \ bindings/js/JSDOMWrapper.cpp \ - bindings/js/JSDatabaseCallback.cpp \ bindings/js/JSDataGridColumnListCustom.cpp \ bindings/js/JSDataGridDataSource.cpp \ bindings/js/JSDatabaseCustom.cpp \ diff --git a/WebCore/Android.mk b/WebCore/Android.mk index 4af6848..3e13e33 100644 --- a/WebCore/Android.mk +++ b/WebCore/Android.mk @@ -594,6 +594,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ \ platform/text/Base64.cpp \ platform/text/BidiContext.cpp \ + platform/text/LineEnding.cpp \ platform/text/RegularExpression.cpp \ platform/text/SegmentedString.cpp \ platform/text/String.cpp \ @@ -823,6 +824,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ storage/SQLResultSet.cpp \ storage/SQLResultSetRowList.cpp \ storage/SQLStatement.cpp \ + storage/SQLStatementSync.cpp \ storage/SQLTransaction.cpp \ storage/SQLTransactionClient.cpp \ storage/SQLTransactionCoordinator.cpp \ |