summaryrefslogtreecommitdiffstats
path: root/JavaScriptCore
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2010-04-29 14:43:44 +0100
committerSteve Block <steveblock@google.com>2010-05-11 14:42:12 +0100
commitcf4a15ec6c0f2acb7982307629d1ec244e7089ca (patch)
tree3159a869ee65b031df14c0ee6b8565519c04488b /JavaScriptCore
parenteebae91469b8f225fe78e97ce6dae26efcf6da43 (diff)
downloadexternal_webkit-cf4a15ec6c0f2acb7982307629d1ec244e7089ca.zip
external_webkit-cf4a15ec6c0f2acb7982307629d1ec244e7089ca.tar.gz
external_webkit-cf4a15ec6c0f2acb7982307629d1ec244e7089ca.tar.bz2
Merge webkit.org at r58033 : Fix Makefiles
Change-Id: Ie97b3c249bbda11ec4bc249be915f88361858d85
Diffstat (limited to 'JavaScriptCore')
-rw-r--r--JavaScriptCore/Android.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/JavaScriptCore/Android.mk b/JavaScriptCore/Android.mk
index 2c2a2d0..b823f2b 100644
--- a/JavaScriptCore/Android.mk
+++ b/JavaScriptCore/Android.mk
@@ -142,6 +142,7 @@ LOCAL_SRC_FILES := \
runtime/RegExpConstructor.cpp \
runtime/RegExpObject.cpp \
runtime/RegExpPrototype.cpp \
+ runtime/RopeImpl.cpp \
runtime/ScopeChain.cpp \
runtime/SmallStrings.cpp \
runtime/StringConstructor.cpp \
@@ -151,7 +152,6 @@ LOCAL_SRC_FILES := \
runtime/StructureChain.cpp \
runtime/TimeoutChecker.cpp \
runtime/UString.cpp \
- runtime/UStringImpl.cpp \
\
wtf/Assertions.cpp \
wtf/ByteArray.cpp \