diff options
| author | Grace Kloba <klobag@google.com> | 2009-09-10 17:38:20 -0700 |
|---|---|---|
| committer | Grace Kloba <klobag@google.com> | 2009-09-10 17:38:20 -0700 |
| commit | e933c7804ccfbfdc83f730e22da8a5401f6f5cee (patch) | |
| tree | 776b9e6139dcfc96ce5c2dbbc23911bf0d8bcf06 /WebCore | |
| parent | d709ea1bc8aa27b597a3ec568e7cb6eb3e094467 (diff) | |
| download | external_webkit-e933c7804ccfbfdc83f730e22da8a5401f6f5cee.zip external_webkit-e933c7804ccfbfdc83f730e22da8a5401f6f5cee.tar.gz external_webkit-e933c7804ccfbfdc83f730e22da8a5401f6f5cee.tar.bz2 | |
Fix the include files from the last WebKit merge. If there is Android version,
we should not include None version. This should fix plugin loading, bookmark
icon problems.
Diffstat (limited to 'WebCore')
| -rw-r--r-- | WebCore/Android.mk | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/WebCore/Android.mk b/WebCore/Android.mk index 37a77d4..595f5a5 100644 --- a/WebCore/Android.mk +++ b/WebCore/Android.mk @@ -48,8 +48,12 @@ # page/Accessibility*.cpp \ # page/InspectorController.cpp \ # page/JavaScript*.cpp \ +# platform/text/TextEncodingDetectorNone.cpp \ # platform/ThreadingNone.cpp \ # platform/graphics/FloatPoint3D.cpp \ +# plugins/PluginDataNone.cpp \ +# plugins/PluginPackageNone.cpp \ +# plugins/PluginViewNone.cpp \ # rendering/RenderThemeChromium*.cpp \ # rendering/RenderThemeSafari.cpp \ # rendering/RenderThemeWin.cpp \ @@ -544,7 +548,6 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ loader/appcache/ManifestParser.cpp \ \ loader/icon/IconDatabase.cpp \ - loader/icon/IconDatabaseNone.cpp \ loader/icon/IconFetcher.cpp \ loader/icon/IconLoader.cpp \ loader/icon/IconRecord.cpp \ @@ -770,7 +773,6 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ platform/text/TextCodecUserDefined.cpp \ platform/text/TextEncoding.cpp \ platform/text/TextEncodingDetectorICU.cpp \ - platform/text/TextEncodingDetectorNone.cpp \ platform/text/TextEncodingRegistry.cpp \ platform/text/TextStream.cpp \ platform/text/UnicodeRange.cpp \ @@ -782,16 +784,13 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ plugins/Plugin.cpp \ plugins/PluginArray.cpp \ plugins/PluginData.cpp \ - plugins/PluginDataNone.cpp \ plugins/PluginDatabase.cpp \ plugins/PluginDebug.cpp \ plugins/PluginInfoStore.cpp \ plugins/PluginMainThreadScheduler.cpp \ plugins/PluginPackage.cpp \ - plugins/PluginPackageNone.cpp \ plugins/PluginStream.cpp \ plugins/PluginView.cpp \ - plugins/PluginViewNone.cpp \ plugins/npapi.cpp \ \ plugins/android/PluginDataAndroid.cpp \ |