diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-05 17:15:17 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-05-10 15:38:31 +0100 |
| commit | 9628e2bda7f58eb73bddf403fddc498c1b97ccac (patch) | |
| tree | bdeff9080d61634a1f4e0ff67680d635f295ae20 /JavaScriptCore | |
| parent | e7bbc0900fd93114f04d2690ce8eab67b784b8c8 (diff) | |
| download | external_webkit-9628e2bda7f58eb73bddf403fddc498c1b97ccac.zip external_webkit-9628e2bda7f58eb73bddf403fddc498c1b97ccac.tar.gz external_webkit-9628e2bda7f58eb73bddf403fddc498c1b97ccac.tar.bz2 | |
Merge WebKit at r74534: Fix Makefiles
Change-Id: Ife4c035f871dd827884645255ce788fbdb49f84e
Diffstat (limited to 'JavaScriptCore')
| -rw-r--r-- | JavaScriptCore/Android.mk | 3 | ||||
| -rw-r--r-- | JavaScriptCore/Android.v8.wtf.mk | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/JavaScriptCore/Android.mk b/JavaScriptCore/Android.mk index f077738..d12bd8a 100644 --- a/JavaScriptCore/Android.mk +++ b/JavaScriptCore/Android.mk @@ -172,11 +172,12 @@ LOCAL_SRC_FILES := \ wtf/HashTable.cpp \ wtf/MD5.cpp \ wtf/MainThread.cpp \ + wtf/OSAllocatorPosix.cpp \ wtf/PageAllocationAligned.cpp\ wtf/PageBlock.cpp\ wtf/RandomNumber.cpp \ wtf/RefCountedLeakCounter.cpp \ - wtf/StackBounds.cpp \ + wtf/StackBounds.cpp \ wtf/TCSystemAlloc.cpp \ wtf/ThreadIdentifierDataPthreads.cpp \ wtf/Threading.cpp \ diff --git a/JavaScriptCore/Android.v8.wtf.mk b/JavaScriptCore/Android.v8.wtf.mk index d92dbb6..340ed90 100644 --- a/JavaScriptCore/Android.v8.wtf.mk +++ b/JavaScriptCore/Android.v8.wtf.mk @@ -41,9 +41,12 @@ LOCAL_SRC_FILES := \ wtf/HashTable.cpp \ wtf/MD5.cpp \ wtf/MainThread.cpp \ + wtf/OSAllocatorPosix.cpp \ + wtf/PageAllocationAligned.cpp \ + wtf/PageBlock.cpp \ wtf/RandomNumber.cpp \ wtf/RefCountedLeakCounter.cpp \ - wtf/StackBounds.cpp \ + wtf/StackBounds.cpp \ wtf/TCSystemAlloc.cpp \ wtf/ThreadIdentifierDataPthreads.cpp \ wtf/Threading.cpp \ |