diff options
| author | Ben Murdoch <benm@google.com> | 2010-10-22 13:49:51 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-10-26 15:21:41 +0100 |
| commit | 7ca64be9978f9d37eb50cfda93839328ab4d0440 (patch) | |
| tree | aa8098e2b10e424d1f5c949d6000bc618cd147c9 /JavaScriptCore | |
| parent | a94275402997c11dd2e778633dacf4b7e630a35d (diff) | |
| download | external_webkit-7ca64be9978f9d37eb50cfda93839328ab4d0440.zip external_webkit-7ca64be9978f9d37eb50cfda93839328ab4d0440.tar.gz external_webkit-7ca64be9978f9d37eb50cfda93839328ab4d0440.tar.bz2 | |
Merge Webkit at r70209: Fix Makefiles.
Change-Id: Ib60d9a927bad38e128765e122e86bcc547a785cf
Diffstat (limited to 'JavaScriptCore')
| -rw-r--r-- | JavaScriptCore/Android.mk | 3 | ||||
| -rw-r--r-- | JavaScriptCore/Android.v8.wtf.mk | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/JavaScriptCore/Android.mk b/JavaScriptCore/Android.mk index c690477..6ae8c84 100644 --- a/JavaScriptCore/Android.mk +++ b/JavaScriptCore/Android.mk @@ -154,6 +154,7 @@ LOCAL_SRC_FILES := \ runtime/RopeImpl.cpp \ runtime/ScopeChain.cpp \ runtime/SmallStrings.cpp \ + runtime/StrictEvalActivation.cpp \ runtime/StringConstructor.cpp \ runtime/StringObject.cpp \ runtime/StringPrototype.cpp \ @@ -196,6 +197,8 @@ LOCAL_SRC_FILES := \ \ wtf/unicode/icu/CollatorICU.cpp \ \ + wtf/url/src/URLCharacterTypes.cpp \ + wtf/url/src/URLEscape.cpp \ wtf/url/src/URLSegments.cpp \ \ yarr/RegexCompiler.cpp \ diff --git a/JavaScriptCore/Android.v8.wtf.mk b/JavaScriptCore/Android.v8.wtf.mk index a9c8a3b..958c4d1 100644 --- a/JavaScriptCore/Android.v8.wtf.mk +++ b/JavaScriptCore/Android.v8.wtf.mk @@ -56,7 +56,7 @@ LOCAL_SRC_FILES := \ \ wtf/text/AtomicString.cpp \ wtf/text/CString.cpp \ - wtf/text/StringBuidler.cpp \ + wtf/text/StringBuilder.cpp \ wtf/text/StringImpl.cpp \ wtf/text/StringStatics.cpp \ wtf/text/WTFString.cpp \ @@ -66,6 +66,8 @@ LOCAL_SRC_FILES := \ \ wtf/unicode/icu/CollatorICU.cpp \ \ + wtf/url/src/URLCharacterTypes.cpp \ + wtf/url/src/URLEscape.cpp \ wtf/url/src/URLSegments.cpp CHARTABLES := $(intermediates)/chartables.c |