summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGrace Kloba <klobag@google.com>2010-01-25 10:28:52 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2010-01-25 10:28:52 -0800
commit98c97471771055661f977820d2101e25b4a51b86 (patch)
tree2446cbc8acc3c5bdd53772f0d92f17d3fe013a3e
parent53e1af87fa4f19eac50b3d6fb45a3a386d156cd0 (diff)
parentf7dbff09c8d416459a317e397e0a46c197dbf862 (diff)
downloadexternal_webkit-98c97471771055661f977820d2101e25b4a51b86.zip
external_webkit-98c97471771055661f977820d2101e25b4a51b86.tar.gz
external_webkit-98c97471771055661f977820d2101e25b4a51b86.tar.bz2
am f7dbff09: Merge "Rearrange the include headers to enable logging." into eclair-mr2
Merge commit 'f7dbff09c8d416459a317e397e0a46c197dbf862' into eclair-mr2-plus-aosp * commit 'f7dbff09c8d416459a317e397e0a46c197dbf862': Rearrange the include headers to enable logging.
-rw-r--r--WebCore/plugins/android/PluginPackageAndroid.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/WebCore/plugins/android/PluginPackageAndroid.cpp b/WebCore/plugins/android/PluginPackageAndroid.cpp
index 664f31c..2019b5c 100644
--- a/WebCore/plugins/android/PluginPackageAndroid.cpp
+++ b/WebCore/plugins/android/PluginPackageAndroid.cpp
@@ -40,11 +40,13 @@
#include <dlfcn.h>
#include <errno.h>
+// un-comment this to enable logging
+//#define PLUGIN_DEBUG_LOCAL
+#define LOG_TAG "WebKit"
+#include "NotImplemented.h"
#include "PluginDebug.h"
#include "PluginDebugAndroid.h"
-#define LOG_TAG "WebKit"
-
namespace WebCore {
// Simple class which calls dlclose() on a dynamic library when going