diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-24 14:09:24 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-06-02 09:53:33 +0100 |
| commit | 3b523b87218c05c8dd49c191e3d5a7a114907e82 (patch) | |
| tree | 9cac2418495c9b21220887e2b785d5eb9bae11b3 /Source/JavaScriptCore | |
| parent | 9921f05212aa840e1ce32e9f04fa60ca4b3bcbb7 (diff) | |
| download | external_webkit-3b523b87218c05c8dd49c191e3d5a7a114907e82.zip external_webkit-3b523b87218c05c8dd49c191e3d5a7a114907e82.tar.gz external_webkit-3b523b87218c05c8dd49c191e3d5a7a114907e82.tar.bz2 | |
Merge WebKit at r80534: Fix makefiles.
Add new and remove deleted files to fix makefiles.
See http://trac.webkit.org/changeset/79861 for new
XSLTreeViewer generation.
Also remove a stub from TemporaryLInkStubs that we now get
by compiling the correct files in JSC (see
http://trac.webkit.org/changeset/78634).
Change-Id: I550b035b7c9c915b42738366da7817dca020c9a8
Diffstat (limited to 'Source/JavaScriptCore')
| -rw-r--r-- | Source/JavaScriptCore/Android.mk | 10 | ||||
| -rw-r--r-- | Source/JavaScriptCore/Android.v8.wtf.mk | 1 |
2 files changed, 10 insertions, 1 deletions
diff --git a/Source/JavaScriptCore/Android.mk b/Source/JavaScriptCore/Android.mk index e789a1a..c6b3737 100644 --- a/Source/JavaScriptCore/Android.mk +++ b/Source/JavaScriptCore/Android.mk @@ -25,7 +25,12 @@ LOCAL_SRC_FILES := \ API/JSValueRef.cpp \ + API/JSCallbackConstructor.cpp \ + API/JSCallbackFunction.cpp \ API/JSCallbackObject.cpp \ + API/JSClassRef.cpp \ + API/JSObjectRef.cpp \ + API/JSStringRef.cpp \ API/OpaqueJSString.cpp \ \ assembler/ARMv7Assembler.cpp \ @@ -39,6 +44,8 @@ LOCAL_SRC_FILES := \ bytecompiler/BytecodeGenerator.cpp \ bytecompiler/NodesCodegen.cpp \ \ + collector/handles/HandleHeap.cpp \ + \ debugger/Debugger.cpp \ debugger/DebuggerActivation.cpp \ debugger/DebuggerCallFrame.cpp \ @@ -98,7 +105,6 @@ LOCAL_SRC_FILES := \ runtime/FunctionConstructor.cpp \ runtime/FunctionPrototype.cpp \ runtime/GCActivityCallback.cpp \ - runtime/GCHandle.cpp \ runtime/GetterSetter.cpp \ runtime/Identifier.cpp \ runtime/InitializeThreading.cpp \ @@ -108,6 +114,7 @@ LOCAL_SRC_FILES := \ runtime/JSArray.cpp \ runtime/JSByteArray.cpp \ runtime/JSCell.cpp \ + runtime/JSChunk.cpp \ runtime/JSFunction.cpp \ runtime/JSGlobalData.cpp \ runtime/JSGlobalObject.cpp \ @@ -177,6 +184,7 @@ LOCAL_SRC_FILES := \ wtf/PageBlock.cpp\ wtf/RandomNumber.cpp \ wtf/RefCountedLeakCounter.cpp \ + wtf/SHA1.cpp \ wtf/StackBounds.cpp \ wtf/TCSystemAlloc.cpp \ wtf/ThreadIdentifierDataPthreads.cpp \ diff --git a/Source/JavaScriptCore/Android.v8.wtf.mk b/Source/JavaScriptCore/Android.v8.wtf.mk index 603c454..140186f 100644 --- a/Source/JavaScriptCore/Android.v8.wtf.mk +++ b/Source/JavaScriptCore/Android.v8.wtf.mk @@ -42,6 +42,7 @@ LOCAL_SRC_FILES := \ wtf/PageBlock.cpp \ wtf/RandomNumber.cpp \ wtf/RefCountedLeakCounter.cpp \ + wtf/SHA1.cpp \ wtf/StackBounds.cpp \ wtf/TCSystemAlloc.cpp \ wtf/ThreadIdentifierDataPthreads.cpp \ |