diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-05-24 11:41:04 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2010-05-25 12:11:02 +0100 |
| commit | 52ea66021a4090d8e3d781f980c2f8cf0cc4c703 (patch) | |
| tree | 4df7d41e9a1f23fdd43d2380c9e0b73da5014fe0 /JavaScriptCore | |
| parent | 92f04dcc93ce5d84e28b0ac2b113dad5cc99a0d9 (diff) | |
| download | external_webkit-52ea66021a4090d8e3d781f980c2f8cf0cc4c703.zip external_webkit-52ea66021a4090d8e3d781f980c2f8cf0cc4c703.tar.gz external_webkit-52ea66021a4090d8e3d781f980c2f8cf0cc4c703.tar.bz2 | |
Merge WebKit at r59636: Fix makefiles
Change-Id: Ie53e458fbec03234aeb3ba16ce4d90aa629d3575
Diffstat (limited to 'JavaScriptCore')
| -rw-r--r-- | JavaScriptCore/Android.mk | 1 | ||||
| -rw-r--r-- | JavaScriptCore/Android.v8.wtf.mk | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/JavaScriptCore/Android.mk b/JavaScriptCore/Android.mk index e51000d..211cea9 100644 --- a/JavaScriptCore/Android.mk +++ b/JavaScriptCore/Android.mk @@ -178,6 +178,7 @@ LOCAL_SRC_FILES := \ wtf/text/AtomicString.cpp \ wtf/text/CString.cpp \ wtf/text/StringImpl.cpp \ + wtf/text/StringStatics.cpp \ wtf/text/WTFString.cpp \ \ wtf/unicode/CollatorDefault.cpp \ diff --git a/JavaScriptCore/Android.v8.wtf.mk b/JavaScriptCore/Android.v8.wtf.mk index c1f114d..16554b1 100644 --- a/JavaScriptCore/Android.v8.wtf.mk +++ b/JavaScriptCore/Android.v8.wtf.mk @@ -56,6 +56,7 @@ LOCAL_SRC_FILES := \ wtf/text/AtomicString.cpp \ wtf/text/CString.cpp \ wtf/text/StringImpl.cpp \ + wtf/text/StringStatics.cpp \ wtf/text/WTFString.cpp \ \ wtf/unicode/CollatorDefault.cpp \ |