summaryrefslogtreecommitdiffstats
path: root/WebCore/config.h
diff options
context:
space:
mode:
Diffstat (limited to 'WebCore/config.h')
-rw-r--r--WebCore/config.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/WebCore/config.h b/WebCore/config.h
index f88ad3b..b259f9e 100644
--- a/WebCore/config.h
+++ b/WebCore/config.h
@@ -81,6 +81,12 @@
// ANDROID def should be after all PLATFORM to avoid override.
#if PLATFORM(ANDROID)
+// Android uses a single set of include directories when building WebKit and
+// JavaScriptCore. Since WebCore/ is included before JavaScriptCore/, Android
+// includes JavaScriptCore/config.h explicitly here to make sure it gets picked
+// up.
+#include <JavaScriptCore/config.h>
+
#define WEBCORE_NAVIGATOR_VENDOR "Google Inc."
// This must be defined before we include FastMalloc.h, below.
#define USE_SYSTEM_MALLOC 1