From 038b6a4374f6db8bd99ba3be1d38a67a95d9eabc Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Tue, 10 Jan 2017 12:08:43 +0000 Subject: [PATCH] Prepare for removal of legacy-test from default targets 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 Change-Id: I0f34fe97154240e8f8eef6816df1c794da60351e --- tests/cts/net/Android.mk | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/tests/cts/net/Android.mk b/tests/cts/net/Android.mk index 4a776409c7..98cde9b874 100644 --- a/tests/cts/net/Android.mk +++ b/tests/cts/net/Android.mk @@ -34,8 +34,14 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := CtsNetTestCases -LOCAL_STATIC_JAVA_LIBRARIES := core-tests-support compatibility-device-util \ - ctstestrunner ctstestserver mockwebserver +LOCAL_STATIC_JAVA_LIBRARIES := \ + core-tests-support \ + compatibility-device-util \ + ctstestrunner \ + ctstestserver \ + mockwebserver \ + junit \ + legacy-android-test # uncomment when b/13249961 is fixed #LOCAL_SDK_VERSION := current