diff options
| author | Steve Block <steveblock@google.com> | 2009-12-01 06:18:11 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-01 06:18:11 -0800 |
| commit | 9f916fc4a8f13e8105acd7eae40dd9d7535586c3 (patch) | |
| tree | 21772f12adf148a9e32ad6b0220a77669e87a164 | |
| parent | 70e6e683de7c73efbae3d27c600ccfa800177b94 (diff) | |
| parent | feb18091fcb31a80be16e4c41cdbcb0864358e0f (diff) | |
| download | external_webkit-9f916fc4a8f13e8105acd7eae40dd9d7535586c3.zip external_webkit-9f916fc4a8f13e8105acd7eae40dd9d7535586c3.tar.gz external_webkit-9f916fc4a8f13e8105acd7eae40dd9d7535586c3.tar.bz2 | |
am feb18091: Merge change I783ff698 into eclair-mr2
Merge commit 'feb18091fcb31a80be16e4c41cdbcb0864358e0f' into eclair-mr2-plus-aosp
* commit 'feb18091fcb31a80be16e4c41cdbcb0864358e0f':
Removes superfluous file V8 DerivedSourcesAllInOne.cpp from Android build.
| -rw-r--r-- | WebCore/Android.v8bindings.mk | 1 | ||||
| -rw-r--r-- | WebCore/bindings/v8/DerivedSourcesAllInOne.cpp | 11 |
2 files changed, 2 insertions, 10 deletions
diff --git a/WebCore/Android.v8bindings.mk b/WebCore/Android.v8bindings.mk index 5326f78..73a0eaf 100644 --- a/WebCore/Android.v8bindings.mk +++ b/WebCore/Android.v8bindings.mk @@ -42,7 +42,6 @@ LOCAL_SRC_FILES += \ bindings/v8/DateExtension.cpp \ bindings/v8/DOMData.cpp \ bindings/v8/DOMDataStore.cpp \ - bindings/v8/DerivedSourcesAllInOne.cpp \ bindings/v8/MainThreadDOMData.cpp \ bindings/v8/NPV8Object.cpp \ bindings/v8/RuntimeEnabledFeatures.cpp \ diff --git a/WebCore/bindings/v8/DerivedSourcesAllInOne.cpp b/WebCore/bindings/v8/DerivedSourcesAllInOne.cpp index d8f2bae..0a88da7 100644 --- a/WebCore/bindings/v8/DerivedSourcesAllInOne.cpp +++ b/WebCore/bindings/v8/DerivedSourcesAllInOne.cpp @@ -98,7 +98,6 @@ #include "bindings/V8File.cpp" #include "bindings/V8FileList.cpp" #include "bindings/V8History.cpp" -#include "bindings/V8Geolocation.cpp" #include "bindings/V8HTMLAllCollection.cpp" #include "bindings/V8HTMLAnchorElement.cpp" #include "bindings/V8HTMLAppletElement.cpp" @@ -188,6 +187,8 @@ #include "bindings/V8NodeIterator.cpp" #include "bindings/V8NodeList.cpp" #include "bindings/V8Notation.cpp" +#include "bindings/V8Notification.cpp" +#include "bindings/V8NotificationCenter.cpp" #include "bindings/V8OverflowEvent.cpp" #include "bindings/V8PageTransitionEvent.cpp" #include "bindings/V8Plugin.cpp" @@ -383,11 +384,3 @@ #if ENABLE(INSPECTOR) #include "bindings/V8InspectorBackend.cpp" #endif - -#if PLATFORM(ANDROID) -// TODO: Upstream NOTIFICATIONS guard. -#if ENABLE(NOTIFICATIONS) -#include "bindings/V8Notification.cpp" -#include "bindings/V8NotificationCenter.cpp" -#endif -#endif |