diff options
author | Steve Block <steveblock@google.com> | 2012-02-22 04:17:33 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-02-22 04:17:33 -0800 |
commit | de300297b89e1786d745a2971bd0e2df50a407df (patch) | |
tree | a047378f7452bcae9058007e40da50aad3abb083 /Android.mk | |
parent | a994d85ef91efe1bf973dbd930ab5ed0ae234048 (diff) | |
parent | 13c343328386eea539a0c767c2f5d62b1440cbf3 (diff) | |
download | external_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 'Android.mk')
-rw-r--r-- | Android.mk | 3 |
1 files changed, 0 insertions, 3 deletions
@@ -391,8 +391,5 @@ include $(BUILD_SHARED_LIBRARY) # Build the wds client include $(WEBKIT_PATH)/android/wds/client/Android.mk -# Build the performance command line tool. -include $(WEBKIT_PATH)/android/benchmark/Android.mk - # Build the webkit merge tool. include $(BASE_PATH)/Tools/android/webkitmerge/Android.mk |