diff options
Diffstat (limited to 'JavaScriptCore/Android.mk')
| -rw-r--r-- | JavaScriptCore/Android.mk | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/JavaScriptCore/Android.mk b/JavaScriptCore/Android.mk index 128d70b..98f22df 100644 --- a/JavaScriptCore/Android.mk +++ b/JavaScriptCore/Android.mk @@ -172,9 +172,15 @@ LOCAL_SRC_FILES := \ wtf/HashTable.cpp \ wtf/MD5.cpp \ wtf/MainThread.cpp \ +<<<<<<< HEAD wtf/PageAllocation.cpp \ +======= + wtf/PageAllocationAligned.cpp\ + wtf/PageBlock.cpp\ +>>>>>>> webkit.org at r74534 (trunk) wtf/RandomNumber.cpp \ wtf/RefCountedLeakCounter.cpp \ + wtf/StackBounds.cpp \ wtf/TCSystemAlloc.cpp \ wtf/ThreadIdentifierDataPthreads.cpp \ wtf/Threading.cpp \ |