summaryrefslogtreecommitdiffstats
path: root/JavaScriptCore
diff options
context:
space:
mode:
authorAndrei Popescu <andreip@google.com>2009-08-19 14:08:46 +0100
committerAndrei Popescu <andreip@google.com>2009-08-19 14:08:46 +0100
commit0a765b92b82dbcf0683bcdb9e18180e7957f7eda (patch)
tree3ec05f44ec5e997c1df700e4fc40f31376c1b62b /JavaScriptCore
parentb025c93b6adb8f94f5604f6a595b2e67522cb67c (diff)
downloadexternal_webkit-0a765b92b82dbcf0683bcdb9e18180e7957f7eda.zip
external_webkit-0a765b92b82dbcf0683bcdb9e18180e7957f7eda.tar.gz
external_webkit-0a765b92b82dbcf0683bcdb9e18180e7957f7eda.tar.bz2
Revert "Start fixing JSC compile errors for new webkit."
This reverts commit 62983d46fda85f4d912c221e5cbc91a05d4edebf.
Diffstat (limited to 'JavaScriptCore')
-rw-r--r--JavaScriptCore/Android.mk4
1 files changed, 3 insertions, 1 deletions
diff --git a/JavaScriptCore/Android.mk b/JavaScriptCore/Android.mk
index a003693..c27c703 100644
--- a/JavaScriptCore/Android.mk
+++ b/JavaScriptCore/Android.mk
@@ -141,6 +141,7 @@ LOCAL_SRC_FILES := \
runtime/Lookup.cpp \
runtime/MarkStack.cpp \
runtime/MarkStackPosix.cpp \
+ runtime/MarkStackWin.cpp \
runtime/MathObject.cpp \
runtime/NativeErrorConstructor.cpp \
runtime/NativeErrorPrototype.cpp \
@@ -193,9 +194,11 @@ LOCAL_SRC_FILES := \
\
wtf/android/MainThreadAndroid.cpp \
\
+ wtf/haiku/MainThreadHaiku.cpp \
wtf/unicode/CollatorDefault.cpp \
wtf/unicode/UTF8.cpp \
\
+ wtf/unicode/glib/UnicodeGLib.cpp \
wtf/unicode/icu/CollatorICU.cpp
# Rule to build grammar.y with our custom bison.
@@ -210,7 +213,6 @@ LOCAL_GENERATED_SOURCES += $(GEN)
JSC_OBJECTS := $(addprefix $(intermediates)/runtime/, \
ArrayPrototype.lut.h \
DatePrototype.lut.h \
- JSONObject.lut.h \
MathObject.lut.h \
NumberConstructor.lut.h \
RegExpConstructor.lut.h \