summaryrefslogtreecommitdiffstats
path: root/JavaScriptCore
diff options
context:
space:
mode:
authorBen Murdoch <benm@google.com>2009-08-19 11:43:56 +0100
committerBen Murdoch <benm@google.com>2009-08-19 11:43:56 +0100
commit62983d46fda85f4d912c221e5cbc91a05d4edebf (patch)
tree55dec1b0880002720841a34aa55305cc4ad0695e /JavaScriptCore
parent632f4508222c2a617e6820e9388867c0f4821db8 (diff)
downloadexternal_webkit-62983d46fda85f4d912c221e5cbc91a05d4edebf.zip
external_webkit-62983d46fda85f4d912c221e5cbc91a05d4edebf.tar.gz
external_webkit-62983d46fda85f4d912c221e5cbc91a05d4edebf.tar.bz2
Start fixing JSC compile errors for new webkit.
Diffstat (limited to 'JavaScriptCore')
-rw-r--r--JavaScriptCore/Android.mk4
1 files changed, 1 insertions, 3 deletions
diff --git a/JavaScriptCore/Android.mk b/JavaScriptCore/Android.mk
index c27c703..a003693 100644
--- a/JavaScriptCore/Android.mk
+++ b/JavaScriptCore/Android.mk
@@ -141,7 +141,6 @@ LOCAL_SRC_FILES := \
runtime/Lookup.cpp \
runtime/MarkStack.cpp \
runtime/MarkStackPosix.cpp \
- runtime/MarkStackWin.cpp \
runtime/MathObject.cpp \
runtime/NativeErrorConstructor.cpp \
runtime/NativeErrorPrototype.cpp \
@@ -194,11 +193,9 @@ 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.
@@ -213,6 +210,7 @@ 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 \