From e2846ab03910843e8c3f7a4b7323d65044586d3a Mon Sep 17 00:00:00 2001
From: Paul Duffin <paulduffin@google.com>
Date: Mon, 28 Nov 2016 14:48:10 +0000
Subject: Change junit-targetdex to contain all JUnit classes

Bug: 30188076
Test: make checkbuild and ran various CTS modules, including CtsLibcoreOjTestCases
Change-Id: Ie889268e6b7c9933c248e532f4ffcca119fb9a0e
---
 Android.mk | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/Android.mk b/Android.mk
index a9132e8..57a1c77 100644
--- a/Android.mk
+++ b/Android.mk
@@ -41,14 +41,12 @@ include $(BUILD_HOST_JAVA_LIBRARY)
 # build a junit-targetdex jar
 
 include $(CLEAR_VARS)
-LOCAL_SRC_FILES := $(call all-java-files-under, src/junit/extensions)
-LOCAL_SRC_FILES += $(core-junit-files)
-LOCAL_SRC_FILES += $(junit-runner-files)
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
 # TODO: lose the suffix here and rename "junit" to "junit-hostdex"
 LOCAL_MODULE := junit-targetdex
-LOCAL_NO_STANDARD_LIBRARIES := true
-LOCAL_JAVA_LIBRARIES := core-oj core-libart
 LOCAL_MODULE_TAGS := tests
+LOCAL_STATIC_JAVA_LIBRARIES := hamcrest
+# The following is needed by external/apache-harmony/Android_debug_config.mk
 LOCAL_MODULE_PATH := $(TARGET_OUT_DATA)/junit
 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk $(LOCAL_PATH)/Common.mk
 include $(BUILD_JAVA_LIBRARY)
-- 
cgit v1.2.3