From 36a6163f6f4704d33efc4f710b7a802937a4aae9 Mon Sep 17 00:00:00 2001
From: Paul Duffin <paulduffin@google.com>
Date: Mon, 12 Dec 2016 15:34:57 +0000
Subject: Make junit4-target an alias for junit

Part of the process of replacing junit4-target with junit so
that junit4-target can be removed.

Bug: 30188076
Test: make checkbuild
Change-Id: Ie9061e6442124fc1a8b99aa420d7b6b263251210
---
 Android.mk |  9 ++-------
 Common.mk  | 16 +---------------
 2 files changed, 3 insertions(+), 22 deletions(-)

diff --git a/Android.mk b/Android.mk
index 55448ed..81db17d 100644
--- a/Android.mk
+++ b/Android.mk
@@ -111,17 +111,12 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk $(LOCAL_PATH)/Common.m
 include $(BUILD_STATIC_JAVA_LIBRARY)
 
 #-------------------------------------------------------
-# build a junit4-target jar representing the
-# classes in external/junit that are not in the core public API 4
-# Note: 'core' here means excluding the classes that are contained
-# in the optional library android.test.runner. Developers who
-# build against this jar shouldn't have to also include android.test.runner
+# build a junit4-target jar as an alias for junit
 
 include $(CLEAR_VARS)
-LOCAL_SRC_FILES := $(junit4-target-src)
 LOCAL_MODULE := junit4-target
 LOCAL_MODULE_TAGS := optional
 LOCAL_SDK_VERSION := 25
-LOCAL_STATIC_JAVA_LIBRARIES := hamcrest
+LOCAL_STATIC_JAVA_LIBRARIES := junit hamcrest
 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk $(LOCAL_PATH)/Common.mk
 include $(BUILD_STATIC_JAVA_LIBRARY)
diff --git a/Common.mk b/Common.mk
index a7d84dc..8dde23a 100644
--- a/Common.mk
+++ b/Common.mk
@@ -3,7 +3,7 @@
 # Shared with frameworks/base.
 # based off libcore/Docs.mk
 # Exports:
-#   core-junit-files, junit-runner-files, junit_to_document, junit4-target-src.
+#   core-junit-files, junit-runner-files, junit_to_document.
 #   They are lists of .java files relative to external/junit/.
 
 ifndef junit4_common_include_once
@@ -44,19 +44,5 @@ junit_to_document := \
  $(core-junit-files) \
  $(junit-runner-files)
 
-# List of source to build into junit4 target jars
-#
-junit4-target-src := \
-$(call find-files-in-subdirs, external/junit, \
-  "*.java", \
-    src/org \
-    src/junit/extensions \
-    src/junit/runner \
-    src/junit/textui) \
-src/junit/framework/ComparisonCompactor.java \
-src/junit/framework/JUnit4TestAdapterCache.java \
-src/junit/framework/JUnit4TestAdapter.java \
-src/junit/framework/JUnit4TestCaseFacade.java
-
 junit4_common_include_once := 1
 endif  # junit4_common_include_once
-- 
cgit v1.2.3