From 2ffc4addb07f9b3bbb6ea14b93d34149eff62e6d Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Tue, 17 Jan 2017 14:36:12 +0000 Subject: [PATCH] Add legacy-android-test target containing android.test classes 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 a legacy-android-test target, containing only the android.test classes, for use by any targets that depend on those classes. Bug: 30188076 Test: make checkbuild Change-Id: Ifc0a9a23d4ac3c78428bb9dde38e547e6978ba7e --- legacy-test/Android.mk | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/legacy-test/Android.mk b/legacy-test/Android.mk index 5e72a0d541cb4..0a814f39b6377 100644 --- a/legacy-test/Android.mk +++ b/legacy-test/Android.mk @@ -18,7 +18,8 @@ LOCAL_PATH:= $(call my-dir) # Build the legacy-test library # ============================= -# This contains the junit.framework classes that were in Android API level 25. +# This contains the junit.framework and android.test classes that were in +# Android API level 25. include $(CLEAR_VARS) LOCAL_SRC_FILES := $(call all-java-files-under, src) @@ -28,6 +29,18 @@ LOCAL_JAVA_LIBRARIES := core-oj core-libart framework include $(BUILD_JAVA_LIBRARY) +# Build the legacy-android-test library +# ============================= +# This contains the android.test classes that were in Android API level 25. +include $(CLEAR_VARS) + +LOCAL_SRC_FILES := $(call all-java-files-under, src/android) +LOCAL_MODULE := legacy-android-test +LOCAL_NO_STANDARD_LIBRARIES := true +LOCAL_JAVA_LIBRARIES := core-oj core-libart framework junit + +include $(BUILD_STATIC_JAVA_LIBRARY) + ifeq ($(HOST_OS),linux) # Build the legacy-performance-test-hostdex library # =================================================