diff options
| author | Ben Murdoch <benm@google.com> | 2009-08-11 12:33:33 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2009-08-11 12:33:33 +0100 |
| commit | 1489f497e23bcd455aa036faa87f0451fc10a63c (patch) | |
| tree | 134827a6f929d8b17833d2e98c0e6dbc2b8f64e7 /JavaScriptCore | |
| parent | 3ac4dcc7e27db648f597d2062fd84997544165f1 (diff) | |
| download | external_webkit-1489f497e23bcd455aa036faa87f0451fc10a63c.zip external_webkit-1489f497e23bcd455aa036faa87f0451fc10a63c.tar.gz external_webkit-1489f497e23bcd455aa036faa87f0451fc10a63c.tar.bz2 | |
Makefile and webkitmerge tool edits needed to merge with latest webkit.
Diffstat (limited to 'JavaScriptCore')
| -rw-r--r-- | JavaScriptCore/Android.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/JavaScriptCore/Android.mk b/JavaScriptCore/Android.mk index a80f19b..f31ddd9 100644 --- a/JavaScriptCore/Android.mk +++ b/JavaScriptCore/Android.mk @@ -181,11 +181,11 @@ LOCAL_SRC_FILES := \ wtf/Threading.cpp \ wtf/ThreadingPthreads.cpp \ \ - wtf/android/MainThreadAndroid.cpp \ - \ wtf/TypeTraits.cpp \ wtf/dtoa.cpp \ \ + wtf/android/MainThreadAndroid.cpp \ + \ wtf/unicode/CollatorDefault.cpp \ wtf/unicode/UTF8.cpp \ \ |