Unbundled build fixes for tests
Build tests against current SDK. Use android-support-test instead of
android.test.runner. Temporarily disable ContextMenuBuilder tests.
Use internal copy of LaunchPerformanceBase. Use reflection to call
CursorLoader.waitForLoader. Make local copy of
android.provider.CallLog.addCall.
Bug:23642167
Change-Id: I6b5901f60cd28cdee4857d9e66696a5c66efcd20
(cherry picked from commit 81b66b8ef878e6209e6f7dfc011e41fe806ec099)
diff --git a/tests/Android.mk b/tests/Android.mk
index 30c6286..21beca8 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -5,7 +5,7 @@
LOCAL_MODULE_TAGS := tests
LOCAL_CERTIFICATE := shared
-LOCAL_JAVA_LIBRARIES := android.test.runner
+LOCAL_STATIC_JAVA_LIBRARIES := android-support-test
# Include all test java files.
LOCAL_SRC_FILES := $(call all-java-files-under, src)
@@ -20,4 +20,6 @@
LOCAL_INSTRUMENTATION_FOR := Dialer
+LOCAL_SDK_VERSION := current
+
include $(BUILD_PACKAGE)