diff options
| author |   Adrian Velicu <adrianv@google.com> | 2014-09-18 11:03:29 +0000 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2014-09-18 11:03:29 +0000 |
| commit | c522013f88ffb29fb1f980e258684370e86e3d76 (patch) | |
| tree | a8f46526dc89e86b8b3efb5f362c7e403405212d | |
| parent | 0055d26164745b24b83d1cbda6d1b1a1acb36342 (diff) | |
| parent | 329dbe22396491d8700e0fa1bf1156dab9ac6cc3 (diff) | |
| download | latinime-c522013f88ffb29fb1f980e258684370e86e3d76.tar.gz latinime-c522013f88ffb29fb1f980e258684370e86e3d76.tar.xz latinime-c522013f88ffb29fb1f980e258684370e86e3d76.zip | |
Merge "Switching to AndroidJUnitRunner instrumentation"
| -rw-r--r-- | tests/Android.mk | 2 | ||||
| -rw-r--r-- | tests/AndroidManifest.xml | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/tests/Android.mk b/tests/Android.mk index 5baebbdbf..a084ad10d 100644 --- a/tests/Android.mk +++ b/tests/Android.mk @@ -24,6 +24,8 @@ LOCAL_AAPT_FLAGS += -0 .dict # Do not compress test data file LOCAL_AAPT_FLAGS += -0 .txt +LOCAL_STATIC_JAVA_LIBRARIES := mockito-target android-support-test + # Include all test java files. LOCAL_SRC_FILES := $(call all-java-files-under, src) diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml index 8a628cdac..26195d39f 100644 --- a/tests/AndroidManifest.xml +++ b/tests/AndroidManifest.xml @@ -26,7 +26,7 @@ <!-- meta-data android:name="com.android.contacts.iconset" android:resource="@xml/iconset" /--> </application> - <instrumentation android:name="android.test.InstrumentationTestRunner" + <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner" android:targetPackage="com.android.inputmethod.latin" android:label="LatinIME tests"> </instrumentation> |