diff options
| author | Soroosh Mariooryad <soroosh@google.com> | 2017-07-21 11:24:01 -0700 |
|---|---|---|
| committer | Soroosh Mariooryad <soroosh@google.com> | 2017-07-21 15:40:00 -0700 |
| commit | 28bd6571b68001826663e7a91a0feedee089ee4f (patch) | |
| tree | 8571159c189128540d5d39335ca6fa8921de97ea | |
| parent | 1ef440bcb1412f2a54ecc43283f6af0d626a510a (diff) | |
| download | misc-28bd6571b68001826663e7a91a0feedee089ee4f.tar.gz | |
DO NOT MERGE: Cherrypick dependency fixes for espresso from master to oc-mr1-dev
master changes: ag/2573455, ag/2576567
Test: make SettingsGoogleUnitTests; runtest --path
vendor/unbundled_google/packages/SettingsGoogle/tests/unit/src/com/google/android/settings/search/SearchRankingDataTest.java
Change-Id: Ibdc6db412772ab646ac0fecc6b1e2fb9b997b744
| -rw-r--r-- | common/android-support-test/Android.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/common/android-support-test/Android.mk b/common/android-support-test/Android.mk index edbff9a2..12becddb 100644 --- a/common/android-support-test/Android.mk +++ b/common/android-support-test/Android.mk @@ -54,7 +54,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := espresso-core LOCAL_MODULE_TAGS := optional LOCAL_SDK_VERSION := 15 -LOCAL_STATIC_JAVA_LIBRARIES := espresso-core-nodep android-support-test-rules-nodep android-support-test-runner-nodep junit hamcrest hamcrest-library android-support-annotations +LOCAL_STATIC_JAVA_LIBRARIES := espresso-core-nodep espresso-idling-resource-nodep android-support-test-rules-nodep android-support-test-runner-nodep junit hamcrest hamcrest-library android-support-annotations jsr330 include $(BUILD_STATIC_JAVA_LIBRARY) include $(CLEAR_VARS) |