From 9628e2bda7f58eb73bddf403fddc498c1b97ccac Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Thu, 5 May 2011 17:15:17 +0100 Subject: Merge WebKit at r74534: Fix Makefiles Change-Id: Ife4c035f871dd827884645255ce788fbdb49f84e --- JavaScriptCore/Android.mk | 3 ++- JavaScriptCore/Android.v8.wtf.mk | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'JavaScriptCore') 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 \ -- cgit v1.1