diff options
| author | Ben Murdoch <benm@google.com> | 2011-06-06 13:20:18 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-06-10 14:57:11 +0100 |
| commit | 808efddb145d485fdb8202437578f218340124b2 (patch) | |
| tree | 102bb6fc821cc0a8d2e52718c77b483292663fe3 /Source/JavaScriptCore | |
| parent | bbcce278be9be6a85f47928c38a74c8d36a13a85 (diff) | |
| download | external_webkit-808efddb145d485fdb8202437578f218340124b2.zip external_webkit-808efddb145d485fdb8202437578f218340124b2.tar.gz external_webkit-808efddb145d485fdb8202437578f218340124b2.tar.bz2 | |
Merge WebKit at r84325: Fix makefiles.
See http://trac.webkit.org/changeset/82562 for
new XMLTreeViewer generation.
Change-Id: I52c8d510602e7e77ea6a134510f8e5bb6b0c4d9a
Diffstat (limited to 'Source/JavaScriptCore')
| -rw-r--r-- | Source/JavaScriptCore/Android.mk | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Source/JavaScriptCore/Android.mk b/Source/JavaScriptCore/Android.mk index 4cb76ad..48f326a 100644 --- a/Source/JavaScriptCore/Android.mk +++ b/Source/JavaScriptCore/Android.mk @@ -44,14 +44,13 @@ LOCAL_SRC_FILES := \ bytecompiler/BytecodeGenerator.cpp \ bytecompiler/NodesCodegen.cpp \ \ - collector/handles/HandleHeap.cpp \ - collector/handles/HandleStack.cpp \ - \ debugger/Debugger.cpp \ debugger/DebuggerActivation.cpp \ debugger/DebuggerCallFrame.cpp \ \ heap/ConservativeRoots.cpp \ + heap/HandleHeap.cpp \ + heap/HandleStack.cpp \ heap/Heap.cpp \ heap/MachineStackMarker.cpp \ heap/MarkStack.cpp \ |