diff options
| author | Steve Block <steveblock@google.com> | 2011-01-05 15:22:02 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-01-06 14:20:46 +0000 |
| commit | 8ebdc3cd1d7fdf78826e8369b1bb7c20798a7d9e (patch) | |
| tree | 662b8931c9cee16fd0db77f1b8fa8e0686fcbe93 /JavaScriptCore | |
| parent | d06194330da2bb8da887d2e1adeacb3a5c1504b2 (diff) | |
| download | external_webkit-8ebdc3cd1d7fdf78826e8369b1bb7c20798a7d9e.zip external_webkit-8ebdc3cd1d7fdf78826e8369b1bb7c20798a7d9e.tar.gz external_webkit-8ebdc3cd1d7fdf78826e8369b1bb7c20798a7d9e.tar.bz2 | |
Merge WebKit at r72805: Fix Makefiles
This is a partial revert of
"Merge Webkit at r73109: Fix Makefiles."
Note that this is a backwards merge from Chromium release 9.0.600.0
to 9.0.597.0, to align with the Chromium 9 stable release branch.
Change-Id: Iac42b5b4232b71fab322bf99e74e7fb6c7be10c5
Diffstat (limited to 'JavaScriptCore')
| -rw-r--r-- | JavaScriptCore/Android.mk | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/JavaScriptCore/Android.mk b/JavaScriptCore/Android.mk index b4fe1f6..128d70b 100644 --- a/JavaScriptCore/Android.mk +++ b/JavaScriptCore/Android.mk @@ -172,7 +172,6 @@ LOCAL_SRC_FILES := \ wtf/HashTable.cpp \ wtf/MD5.cpp \ wtf/MainThread.cpp \ - wtf/OSAllocatorPosix.cpp \ wtf/PageAllocation.cpp \ wtf/RandomNumber.cpp \ wtf/RefCountedLeakCounter.cpp \ |