diff options
| author | Paul Duffin <paulduffin@google.com> | 2017-05-03 12:11:37 +0100 |
|---|---|---|
| committer | Paul Duffin <paulduffin@google.com> | 2017-05-03 12:11:37 +0100 |
| commit | 49f3d944cf2413562ae5032b8dfc2c39955c6bf7 (patch) | |
| tree | a30b035b321c251220c7990108422a3b36a3d22c | |
| parent | 668b6077de19c7254f4e72dfbd8a27c00a7e04a6 (diff) | |
| download | multidex-49f3d944cf2413562ae5032b8dfc2c39955c6bf7.tar.gz | |
Prepare for removal of junit and android.test classes from Android API (step 1)android-wear-o-preview-4android-wear-o-preview-3android-o-preview-2
In preparation for removing junit and android.test classes from
the Android API this change adds explicit dependencies on junit
and/or legacy-android-test to ensure that modules will compile
properly once it is removed.
Care was taken to ensure that any targets that depended,
directly or indirectly, on android-support-test did not also
depend on junit or hamcrest as they conflict with the versions
embedded within android-support-test.
Bug: 30188076
Test: make checkbuild
Change-Id: If3c3566dd730a0df046ba1733bf8a20b29c9e335
| -rw-r--r-- | instrumentation/Android.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/instrumentation/Android.mk b/instrumentation/Android.mk index ec50b8c..8db4932 100644 --- a/instrumentation/Android.mk +++ b/instrumentation/Android.mk @@ -17,6 +17,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := android-support-multidex-instrumentation LOCAL_JAVA_LIBRARIES := android-support-multidex +LOCAL_STATIC_JAVA_LIBRARIES := legacy-android-test LOCAL_SDK_VERSION := 4 LOCAL_SRC_FILES := $(call all-java-files-under, src) |