diff options
| author | Paul Duffin <paulduffin@google.com> | 2017-01-18 15:09:42 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-01-18 15:09:42 +0000 |
| commit | 44c1afdc7fe9f4420933ad0c9fd824931179ca27 (patch) | |
| tree | 431c29a6458f25bd3a41e26b4085833afbfebfde | |
| parent | db9e56344d2ef16618aa7227058028229d410431 (diff) | |
| parent | 9b345b59913416a7e86f65e993ed6cc1722c6541 (diff) | |
| download | Launcher2-44c1afdc7fe9f4420933ad0c9fd824931179ca27.tar.gz | |
Merge "Prepare for removal of legacy-test from default targets" am: 96360a5935 am: 043c5d763bandroid-wear-o-preview-4android-wear-o-preview-3android-o-preview-4android-o-preview-3android-o-preview-2android-o-iot-preview-5android-n-iot-preview-4o-iot-preview-5n-iot-preview-4
am: 9b345b5991
Change-Id: I00e5624f3f400b9f5563c5fb8167bb4ecc5bfb81
| -rw-r--r-- | tests/stress/Android.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/stress/Android.mk b/tests/stress/Android.mk index 68289bd3..3c911793 100644 --- a/tests/stress/Android.mk +++ b/tests/stress/Android.mk @@ -19,6 +19,7 @@ include $(CLEAR_VARS) LOCAL_MODULE_TAGS := tests LOCAL_JAVA_LIBRARIES := android.test.runner +LOCAL_STATIC_JAVA_LIBRARIES := junit legacy-android-test LOCAL_SRC_FILES := $(call all-java-files-under, src) |