summaryrefslogtreecommitdiffstats
path: root/Source/WebKit/Android.mk
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2012-02-22 04:17:33 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-02-22 04:17:33 -0800
commitde300297b89e1786d745a2971bd0e2df50a407df (patch)
treea047378f7452bcae9058007e40da50aad3abb083 /Source/WebKit/Android.mk
parenta994d85ef91efe1bf973dbd930ab5ed0ae234048 (diff)
parent13c343328386eea539a0c767c2f5d62b1440cbf3 (diff)
downloadexternal_webkit-de300297b89e1786d745a2971bd0e2df50a407df.zip
external_webkit-de300297b89e1786d745a2971bd0e2df50a407df.tar.gz
external_webkit-de300297b89e1786d745a2971bd0e2df50a407df.tar.bz2
Merge changes I6312736c,I55a2ecd2
* changes: Remove benchmark tool Fix comments for willLoadFromCache()
Diffstat (limited to 'Source/WebKit/Android.mk')
-rw-r--r--Source/WebKit/Android.mk3
1 files changed, 0 insertions, 3 deletions
diff --git a/Source/WebKit/Android.mk b/Source/WebKit/Android.mk
index 68ba036..36664dd 100644
--- a/Source/WebKit/Android.mk
+++ b/Source/WebKit/Android.mk
@@ -52,9 +52,6 @@ LOCAL_SRC_FILES += \
android/RenderSkinMediaButton.cpp \
android/RenderSkinNinePatch.cpp \
\
- android/benchmark/Intercept.cpp \
- android/benchmark/MyJavaVM.cpp \
- \
android/icu/unicode/ucnv.cpp \
\
android/jni/AndroidHitTestResult.cpp \