diff options
| author | Paul Duffin <paulduffin@google.com> | 2017-01-17 14:49:42 +0000 |
|---|---|---|
| committer | Paul Duffin <paulduffin@google.com> | 2017-01-18 14:06:27 +0000 |
| commit | 8a9b332e5284881af8534fad8d6cad8c93ddb840 (patch) | |
| tree | d0e19d240310cb16d5c3c52da08d73a7b0b8fb4e | |
| parent | f6b069b92eb00dc089326cac9e8df3d5be307823 (diff) | |
| download | ManagedProvisioning-o-preview.tar.gz | |
Prepare for removal of legacy-test from default targetsandroid-o-preview-1o-preview
In preparation for removing junit classes from the Android API
the legacy-test target will be removed from the
TARGET_DEFAULT_JAVA_LIBRARIES. This change adds explicit
dependencies on junit and/or legacy-android-test to ensure that
modules will compile properly once it is removed.
Bug: 30188076
Test: make checkbuild
Merged-In: I0b79a47a9143cdbe009355ebd8cfedda042000bb
Change-Id: I4e24a7b92bdb94023bed0e3f2ef3b8380ac76d39
| -rw-r--r-- | tests/Android.mk | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/Android.mk b/tests/Android.mk index a05a12d80..5a76018d4 100644 --- a/tests/Android.mk +++ b/tests/Android.mk @@ -10,7 +10,10 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := ManagedProvisioningTests LOCAL_CERTIFICATE := platform -LOCAL_STATIC_JAVA_LIBRARIES := android-support-test mockito-target +LOCAL_STATIC_JAVA_LIBRARIES := \ + android-support-test \ + mockito-target \ + legacy-android-test LOCAL_INSTRUMENTATION_FOR := ManagedProvisioning |