diff options
| author | Steve Block <steveblock@google.com> | 2010-05-26 11:33:23 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-05-27 11:16:16 +0100 |
| commit | 015ed43c039417e12bbef7b2fe1b67f88de5ed44 (patch) | |
| tree | b77e0d308631cf13c529d10ab1d369497be5363a /JavaScriptCore | |
| parent | 1e6338658628fcabd955cf65687a30976c7893ce (diff) | |
| download | external_webkit-015ed43c039417e12bbef7b2fe1b67f88de5ed44.zip external_webkit-015ed43c039417e12bbef7b2fe1b67f88de5ed44.tar.gz external_webkit-015ed43c039417e12bbef7b2fe1b67f88de5ed44.tar.bz2 | |
Merge WebKit at r60074: Fix Android makefiles
Change-Id: I549373cf00e9cc72060eccaf55e6a3efb0623df0
Diffstat (limited to 'JavaScriptCore')
| -rw-r--r-- | JavaScriptCore/Android.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/JavaScriptCore/Android.mk b/JavaScriptCore/Android.mk index 60ce27f..e4199fe 100644 --- a/JavaScriptCore/Android.mk +++ b/JavaScriptCore/Android.mk @@ -118,6 +118,7 @@ LOCAL_SRC_FILES := \ runtime/JSNumberCell.cpp \ runtime/JSONObject.cpp \ runtime/JSObject.cpp \ + runtime/JSObjectWithGlobalObject.cpp \ runtime/JSPropertyNameIterator.cpp \ runtime/JSStaticScopeObject.cpp \ runtime/JSString.cpp \ |