diff options
| author | Paul Duffin <paulduffin@google.com> | 2017-12-08 18:02:18 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-12-08 18:02:18 +0000 |
| commit | 824e243907916013705b42a8566c26bf3a55266f (patch) | |
| tree | 12dcd799a2714613072bcad84101ffa909db1cb0 | |
| parent | 8164ea89e4e444eff100e9befca2f7b2089e40d5 (diff) | |
| parent | 702ce7a78cfca923997e84f953c30cdc24146d12 (diff) | |
| download | ContactsProvider-824e243907916013705b42a8566c26bf3a55266f.tar.gz | |
Merge "Stop statically including legacy-android-test"
| -rw-r--r-- | tests/Android.mk | 5 | ||||
| -rw-r--r-- | tests2/Android.mk | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/tests/Android.mk b/tests/Android.mk index 8df1d6d4..e0c62843 100644 --- a/tests/Android.mk +++ b/tests/Android.mk @@ -7,10 +7,9 @@ LOCAL_MODULE_TAGS := tests LOCAL_STATIC_JAVA_LIBRARIES := \ ContactsProviderTestUtils \ android-support-test \ - mockito-target-minus-junit4 \ - legacy-android-test + mockito-target-minus-junit4 -LOCAL_JAVA_LIBRARIES := android.test.runner +LOCAL_JAVA_LIBRARIES := android.test.runner android.test.base android.test.mock # Only compile source java files in this apk. LOCAL_SRC_FILES := $(call all-java-files-under, src) diff --git a/tests2/Android.mk b/tests2/Android.mk index bb4443f3..4a0fdfb0 100644 --- a/tests2/Android.mk +++ b/tests2/Android.mk @@ -22,10 +22,9 @@ LOCAL_MODULE_TAGS := tests LOCAL_STATIC_JAVA_LIBRARIES := \ ContactsProviderTestUtils \ android-support-test \ - mockito-target-minus-junit4 \ - legacy-android-test + mockito-target-minus-junit4 -LOCAL_JAVA_LIBRARIES := android.test.runner +LOCAL_JAVA_LIBRARIES := android.test.runner android.test.base LOCAL_SRC_FILES := $(call all-java-files-under, src) |