commit 0ec05b3ca7fb4bd16a5442cf314b2ec0eb91c530
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Dec 08 15:42:29 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Dec 08 15:42:29 2017 +0000
tree 9c8f5ca6bcdeeb13345ff2722f54ec0724312057
parent 9d63d6b995540c371d6efdc6965343d974b2fc6a
parent bed51fc9b906d5e295d33641f97cb1d1e6fc8513

Merge "Stop statically including legacy-android-test"

tests/cts/net/Android.mk

diff --git a/tests/cts/net/Android.mk b/tests/cts/net/Android.mk
index 4aeab38..1d4d54b 100644
--- a/tests/cts/net/Android.mk
+++ b/tests/cts/net/Android.mk
@@ -24,7 +24,12 @@
 # Include both the 32 and 64 bit versions
 LOCAL_MULTILIB := both
 
-LOCAL_JAVA_LIBRARIES := voip-common conscrypt org.apache.http.legacy
+LOCAL_JAVA_LIBRARIES := \
+    voip-common \
+    conscrypt \
+    org.apache.http.legacy \
+    android.test.base \
+
 
 LOCAL_JNI_SHARED_LIBRARIES := libcts_jni libnativedns_jni \
                               libnativemultinetwork_jni libnativehelper_compat_libc++
@@ -40,8 +45,7 @@
     ctstestrunner \
     ctstestserver \
     mockwebserver \
-    junit \
-    legacy-android-test
+    junit
 
 # uncomment when b/13249961 is fixed
 #LOCAL_SDK_VERSION := current