diff options
| author | Ben Murdoch <benm@google.com> | 2010-08-11 14:44:44 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-08-12 19:15:41 +0100 |
| commit | dd8bb3de4f353a81954234999f1fea748aee2ea9 (patch) | |
| tree | 729b52bf09294f0d6c67cd5ea80aee1b727b7bd8 /WebCore/Android.derived.jscbindings.mk | |
| parent | f3d41ba51d86bf719c7a65ab5297aea3c17e2d98 (diff) | |
| download | external_webkit-dd8bb3de4f353a81954234999f1fea748aee2ea9.zip external_webkit-dd8bb3de4f353a81954234999f1fea748aee2ea9.tar.gz external_webkit-dd8bb3de4f353a81954234999f1fea748aee2ea9.tar.bz2 | |
Merge WebKit at r65072 : Initial merge by git.
Change-Id: Ibcf418498376b2660aacb7f8d46ea7085ef91585
Diffstat (limited to 'WebCore/Android.derived.jscbindings.mk')
| -rw-r--r-- | WebCore/Android.derived.jscbindings.mk | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/WebCore/Android.derived.jscbindings.mk b/WebCore/Android.derived.jscbindings.mk index 7dfb90e..7492522 100644 --- a/WebCore/Android.derived.jscbindings.mk +++ b/WebCore/Android.derived.jscbindings.mk @@ -1,3 +1,4 @@ + ## ## Copyright 2009, The Android Open Source Project ## @@ -105,7 +106,11 @@ GEN := \ $(intermediates)/dom/JSDOMCoreException.h \ $(intermediates)/dom/JSDOMImplementation.h \ $(intermediates)/dom/JSDOMStringList.h \ +<<<<<<< HEAD $(intermediates)/dom/JSDOMStringMap.h \ +======= + $(intermediates)/dom/JSDeviceMotionEvent.h \ +>>>>>>> webkit.org at r65072 $(intermediates)/dom/JSDeviceOrientationEvent.h \ $(intermediates)/dom/JSDocument.h \ $(intermediates)/dom/JSDocumentFragment.h \ @@ -387,17 +392,20 @@ $(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/storage/%.cpp : $(intermediates)/ # Indexed Database GEN := \ $(intermediates)/storage/JSIDBAny.h \ + $(intermediates)/storage/JSIDBCursor.h \ $(intermediates)/storage/JSIDBDatabaseError.h \ $(intermediates)/storage/JSIDBDatabaseException.h \ - $(intermediates)/storage/JSIDBDatabaseRequest.h \ + $(intermediates)/storage/JSIDBDatabase.h \ $(intermediates)/storage/JSIDBErrorEvent.h \ $(intermediates)/storage/JSIDBEvent.h \ $(intermediates)/storage/JSIDBFactory.h \ $(intermediates)/storage/JSIDBIndex.h \ $(intermediates)/storage/JSIDBKey.h \ $(intermediates)/storage/JSIDBKeyRange.h \ + $(intermediates)/storage/JSIDBObjectStore.h \ $(intermediates)/storage/JSIDBRequest.h \ - $(intermediates)/storage/JSIDBSuccessEvent.h + $(intermediates)/storage/JSIDBSuccessEvent.h \ + $(intermediates)/storage/JSIDBTransaction.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 --include storage --outputdir $(dir $@) $< |