commit a1e8995bb719c20725e4d373d3a26a058e9b9819
author Jay Shrauner <shrauner@google.com> Thu Aug 27 16:20:51 2015 -0700
committer Jay Shrauner <shrauner@google.com> Sat Aug 29 18:20:02 2015 +0000
tree edcbe88327f65534d7050aeb95f60eeb5d1161a3
parent 6fa803920dc08651f92acbe2e8e9137348650b52

Unbundled build fixes for tests

Build tests against current SDK. Use internal copy of LaunchPerformanceBase.
Use android-support-test instead of android.test.runner. Use reflection
to call AsyncTaskLoader.waitForLoader. Use public PhoneNumberUtil APIs.

Bug:23642167
Change-Id: I66841fe9429e374a931a5c6eada5afce932c5bef
(cherry picked from commit 2f8ebf44226b979a214b68189b832429aec04aed)

tests/Android.mk

diff --git a/tests/Android.mk b/tests/Android.mk
index 880f62f..fe4c9b2 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -5,10 +5,10 @@
 LOCAL_MODULE_TAGS := tests
 LOCAL_CERTIFICATE := shared
 
-LOCAL_JAVA_LIBRARIES := android.test.runner
+LOCAL_STATIC_JAVA_LIBRARIES := android-support-test
 
 src_dirs := src \
-    ../../ContactsCommon/TestCommon/src 
+    ../../ContactsCommon/TestCommon/src
 
 # Include all test java files.
 LOCAL_SRC_FILES := $(call all-java-files-under, $(src_dirs))
@@ -17,4 +17,6 @@
 
 LOCAL_INSTRUMENTATION_FOR := Contacts
 
+LOCAL_SDK_VERSION := current
+
 include $(BUILD_PACKAGE)