Small tweaks to Tile Benchmark test
* tag the module as 'tests' so the apk gets includes in test build
* merge the instrumentation into TileBenchmark app and eliminate
the test apk entirely
* changed the default test suite to 'alexa25_2011' which is a suite
of pages based on top 25 news sites from alexa, includes primarily
english sites, and 3 CJK sites
Change-Id: Icd40a70b560bfd7c521adf8ad4b1068483698103
diff --git a/tests/TileBenchmark/Android.mk b/tests/TileBenchmark/Android.mk
index 430f0f1..5851113 100644
--- a/tests/TileBenchmark/Android.mk
+++ b/tests/TileBenchmark/Android.mk
@@ -21,12 +21,8 @@
LOCAL_PACKAGE_NAME := TileBenchmark
-include $(BUILD_PACKAGE)
+LOCAL_MODULE_TAGS := tests
-##################################################
-include $(CLEAR_VARS)
+LOCAL_JAVA_LIBRARIES := android.test.runner
-include $(BUILD_MULTI_PREBUILT)
-
-# Use the folloing include to make our test apk.
-include $(call all-makefiles-under,$(LOCAL_PATH))
+include $(BUILD_PACKAGE)
\ No newline at end of file