diff options
| author | Ben Murdoch <benm@google.com> | 2010-08-11 15:15:13 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-08-12 19:15:42 +0100 |
| commit | 6567c2a19dd910c1f036bc638bab106fd6350e96 (patch) | |
| tree | 4fa8717aca63314e3af344324fc5d2c914d33988 /JavaScriptCore | |
| parent | dd8bb3de4f353a81954234999f1fea748aee2ea9 (diff) | |
| download | external_webkit-6567c2a19dd910c1f036bc638bab106fd6350e96.zip external_webkit-6567c2a19dd910c1f036bc638bab106fd6350e96.tar.gz external_webkit-6567c2a19dd910c1f036bc638bab106fd6350e96.tar.bz2 | |
Merge Webkit at r65072 : Fix Makefiles.
Change-Id: I2da1ae98ee39f7f817d4b4363140872b931ac8bf
Diffstat (limited to 'JavaScriptCore')
| -rw-r--r-- | JavaScriptCore/Android.mk | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/JavaScriptCore/Android.mk b/JavaScriptCore/Android.mk index 09af86e..959fbc4 100644 --- a/JavaScriptCore/Android.mk +++ b/JavaScriptCore/Android.mk @@ -28,6 +28,8 @@ LOCAL_SRC_FILES := \ API/JSCallbackObject.cpp \ API/OpaqueJSString.cpp \ \ + assembler/ARMv7Assembler.cpp \ + \ bytecode/CodeBlock.cpp \ bytecode/JumpTable.cpp \ bytecode/Opcode.cpp \ @@ -98,6 +100,7 @@ LOCAL_SRC_FILES := \ runtime/Executable.cpp \ runtime/FunctionConstructor.cpp \ runtime/FunctionPrototype.cpp \ + runtime/GCActivityCallback.cpp \ runtime/GCHandle.cpp \ runtime/GetterSetter.cpp \ runtime/GlobalEvalFunction.cpp \ |