From 52ea66021a4090d8e3d781f980c2f8cf0cc4c703 Mon Sep 17 00:00:00 2001 From: Kristian Monsen Date: Mon, 24 May 2010 11:41:04 +0100 Subject: Merge WebKit at r59636: Fix makefiles Change-Id: Ie53e458fbec03234aeb3ba16ce4d90aa629d3575 --- JavaScriptCore/Android.mk | 1 + JavaScriptCore/Android.v8.wtf.mk | 1 + 2 files changed, 2 insertions(+) (limited to 'JavaScriptCore') diff --git a/JavaScriptCore/Android.mk b/JavaScriptCore/Android.mk index e51000d..211cea9 100644 --- a/JavaScriptCore/Android.mk +++ b/JavaScriptCore/Android.mk @@ -178,6 +178,7 @@ LOCAL_SRC_FILES := \ wtf/text/AtomicString.cpp \ wtf/text/CString.cpp \ wtf/text/StringImpl.cpp \ + wtf/text/StringStatics.cpp \ wtf/text/WTFString.cpp \ \ wtf/unicode/CollatorDefault.cpp \ diff --git a/JavaScriptCore/Android.v8.wtf.mk b/JavaScriptCore/Android.v8.wtf.mk index c1f114d..16554b1 100644 --- a/JavaScriptCore/Android.v8.wtf.mk +++ b/JavaScriptCore/Android.v8.wtf.mk @@ -56,6 +56,7 @@ LOCAL_SRC_FILES := \ wtf/text/AtomicString.cpp \ wtf/text/CString.cpp \ wtf/text/StringImpl.cpp \ + wtf/text/StringStatics.cpp \ wtf/text/WTFString.cpp \ \ wtf/unicode/CollatorDefault.cpp \ -- cgit v1.1