diff options
| author | Steve Block <steveblock@google.com> | 2010-02-02 18:38:11 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-02-04 21:31:42 +0000 |
| commit | b5909d0379f5d5440e8c0596b1c7ddc564284be6 (patch) | |
| tree | 91332f9fb68bda74f290061496213222a2d504b5 /JavaScriptCore | |
| parent | 8e01d563a1fb60c26584e9a59bda08670cf86e91 (diff) | |
| download | external_webkit-b5909d0379f5d5440e8c0596b1c7ddc564284be6.zip external_webkit-b5909d0379f5d5440e8c0596b1c7ddc564284be6.tar.gz external_webkit-b5909d0379f5d5440e8c0596b1c7ddc564284be6.tar.bz2 | |
Merge webkit.org at r54127 : Fix Makefiles
Note that we update the XCode project file to add the new
GeolocationPositionCache files to allow us to build Android WebKit on Mac.
Change-Id: Iab5f73da50b0457cf6212d0aa1a8f6a413027f50
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 e76da32..3a65b81 100644 --- a/JavaScriptCore/Android.mk +++ b/JavaScriptCore/Android.mk @@ -141,6 +141,7 @@ LOCAL_SRC_FILES := \ runtime/StructureChain.cpp \ runtime/TimeoutChecker.cpp \ runtime/UString.cpp \ + runtime/UStringImpl.cpp \ \ wrec/CharacterClass.cpp \ wrec/CharacterClassConstructor.cpp \ |