commit 996bd8bf2d65cffa3ea9b64fddef9dab51b56af5
author Paul Duffin <paulduffin@google.com> Wed May 03 13:57:42 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed May 03 13:57:42 2017 +0000
tree 2c4bb7fb4b6456d20542a66b45eb91f4dc50e316
parent eadfa6df97992f26ffb5de91865f87a4b62dc84a
parent eaeb6e4c29a00a1ae1fb90fb0e3ff4d00f818cc3

Prepare for removal of junit and android.test classes from Android API (step 1) am: 49f3d944cf am: 8c2d2db0e3 am: 49cff4d6d9
am: eaeb6e4c29

Change-Id: I4f4ce2e70d6d22825f17b5436d89891a9fc7381f

instrumentation/Android.mk

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 @@
 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)