diff options
| author | Ben Murdoch <benm@google.com> | 2010-05-12 11:02:25 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-05-14 12:25:33 +0100 |
| commit | 29f0a62964e6adec9e96e568d68e1605072d06f4 (patch) | |
| tree | 3e379dedcdac3cc667b1bb8740a91adb11478eca /JavaScriptCore | |
| parent | 57a47dd4f75b9c15804c3c61479540cfdc11bd6e (diff) | |
| download | external_webkit-29f0a62964e6adec9e96e568d68e1605072d06f4.zip external_webkit-29f0a62964e6adec9e96e568d68e1605072d06f4.tar.gz external_webkit-29f0a62964e6adec9e96e568d68e1605072d06f4.tar.bz2 | |
Merge Webkit at r58956: Update Android makefiles.
Change-Id: Ie3bcd0e3d0363ad5fdfa26e275af3cca5f147ca2
Diffstat (limited to 'JavaScriptCore')
| -rw-r--r-- | JavaScriptCore/Android.mk | 8 | ||||
| -rw-r--r-- | JavaScriptCore/Android.v8.wtf.mk | 5 |
2 files changed, 10 insertions, 3 deletions
diff --git a/JavaScriptCore/Android.mk b/JavaScriptCore/Android.mk index b823f2b..e51000d 100644 --- a/JavaScriptCore/Android.mk +++ b/JavaScriptCore/Android.mk @@ -50,10 +50,12 @@ LOCAL_SRC_FILES := \ jit/ExecutableAllocatorPosix.cpp \ jit/JIT.cpp \ jit/JITArithmetic.cpp \ + jit/JITArithmetic32_64.cpp \ jit/JITCall.cpp \ jit/JITOpcodes.cpp \ jit/JITPropertyAccess.cpp \ jit/JITStubs.cpp \ + jit/ThunkGenerators.cpp \ \ parser/Lexer.cpp \ parser/Nodes.cpp \ @@ -159,6 +161,7 @@ LOCAL_SRC_FILES := \ wtf/DateMath.cpp \ wtf/FastMalloc.cpp \ wtf/HashTable.cpp \ + wtf/MD5.cpp \ wtf/MainThread.cpp \ wtf/RandomNumber.cpp \ wtf/RefCountedLeakCounter.cpp \ @@ -166,9 +169,8 @@ LOCAL_SRC_FILES := \ wtf/ThreadIdentifierDataPthreads.cpp \ wtf/Threading.cpp \ wtf/ThreadingPthreads.cpp \ - wtf/WTFThreadData.cpp \ - \ wtf/TypeTraits.cpp \ + wtf/WTFThreadData.cpp \ wtf/dtoa.cpp \ \ wtf/android/MainThreadAndroid.cpp \ @@ -183,6 +185,8 @@ LOCAL_SRC_FILES := \ \ wtf/unicode/icu/CollatorICU.cpp \ \ + wtf/url/src/URLSegments.cpp \ + \ yarr/RegexCompiler.cpp \ yarr/RegexInterpreter.cpp \ yarr/RegexJIT.cpp diff --git a/JavaScriptCore/Android.v8.wtf.mk b/JavaScriptCore/Android.v8.wtf.mk index 9249e47..c1f114d 100644 --- a/JavaScriptCore/Android.v8.wtf.mk +++ b/JavaScriptCore/Android.v8.wtf.mk @@ -38,6 +38,7 @@ LOCAL_SRC_FILES := \ wtf/DateMath.cpp \ wtf/FastMalloc.cpp \ wtf/HashTable.cpp \ + wtf/MD5.cpp \ wtf/MainThread.cpp \ wtf/RandomNumber.cpp \ wtf/RefCountedLeakCounter.cpp \ @@ -60,7 +61,9 @@ LOCAL_SRC_FILES := \ wtf/unicode/CollatorDefault.cpp \ wtf/unicode/UTF8.cpp \ \ - wtf/unicode/icu/CollatorICU.cpp + wtf/unicode/icu/CollatorICU.cpp \ + \ + wtf/url/src/URLSegments.cpp CHARTABLES := $(intermediates)/chartables.c $(CHARTABLES): PRIVATE_PATH := $(LOCAL_PATH) |