diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-07-30 15:23:17 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2010-08-04 13:01:35 +0100 |
| commit | 3327b402405fd9155abbcf63c0ea972f77a3d35c (patch) | |
| tree | 236f6fb8ff133e9f230c323fe59a72df4fd6f093 /JavaScriptCore | |
| parent | 12c3bcdf8b6154d6be87a0b8d88e6f8de9ff222a (diff) | |
| download | external_webkit-3327b402405fd9155abbcf63c0ea972f77a3d35c.zip external_webkit-3327b402405fd9155abbcf63c0ea972f77a3d35c.tar.gz external_webkit-3327b402405fd9155abbcf63c0ea972f77a3d35c.tar.bz2 | |
Merge Webkit at r64264 : Fix Makefiles.
Change-Id: Ie4783363cff9eb7f70d6bbfec1a6237b5f5a72b5
Diffstat (limited to 'JavaScriptCore')
| -rw-r--r-- | JavaScriptCore/Android.mk | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/JavaScriptCore/Android.mk b/JavaScriptCore/Android.mk index d55d8ab..a728a4a 100644 --- a/JavaScriptCore/Android.mk +++ b/JavaScriptCore/Android.mk @@ -47,7 +47,6 @@ LOCAL_SRC_FILES := \ \ jit/ExecutableAllocator.cpp\ jit/ExecutableAllocatorFixedVMPool.cpp \ - jit/ExecutableAllocatorPosix.cpp \ jit/JIT.cpp \ jit/JITArithmetic.cpp \ jit/JITArithmetic32_64.cpp \ @@ -167,7 +166,7 @@ LOCAL_SRC_FILES := \ wtf/HashTable.cpp \ wtf/MD5.cpp \ wtf/MainThread.cpp \ - jit/PageAllocation.cpp\ + wtf/PageAllocation.cpp \ wtf/RandomNumber.cpp \ wtf/RefCountedLeakCounter.cpp \ wtf/TCSystemAlloc.cpp \ |