commit c91eebbc97a77a65b5796119269984e2d2103431
author Paul Duffin <paulduffin@google.com> Mon Nov 28 12:29:20 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Nov 28 12:29:21 2016 +0000
tree 2084b329c7a18b004daf4ad9453beca1caeb5143
parent e256362250089632662684f849a9e04a7826b99f
parent 1eac8b3c7b6ae72ab87e806457854e6824e0cfd0

Merge "Use junit-hostdex instead of core-junit-hostdex/junit4-target-hostdex"

JavaLibrary.mk

diff --git a/JavaLibrary.mk b/JavaLibrary.mk
index 04c5fcb..cda2d47 100644
--- a/JavaLibrary.mk
+++ b/JavaLibrary.mk
@@ -180,8 +180,8 @@
 LOCAL_SRC_FILES := $(call all-java-files-under, dalvik/test-rules/src/main test-rules/src/main)
 LOCAL_NO_STANDARD_LIBRARIES := true
 LOCAL_MODULE := core-test-rules-hostdex
-LOCAL_JAVA_LIBRARIES := core-oj-hostdex core-libart-hostdex core-junit-hostdex
-LOCAL_STATIC_JAVA_LIBRARIES := junit4-target-hostdex
+LOCAL_JAVA_LIBRARIES := core-oj-hostdex core-libart-hostdex
+LOCAL_STATIC_JAVA_LIBRARIES := junit-hostdex
 include $(BUILD_HOST_DALVIK_JAVA_LIBRARY)
 
 include $(CLEAR_VARS)
@@ -359,7 +359,7 @@
     LOCAL_SRC_FILES := $(test_src_files)
     LOCAL_JAVA_RESOURCE_DIRS := $(test_resource_dirs)
     LOCAL_NO_STANDARD_LIBRARIES := true
-    LOCAL_JAVA_LIBRARIES := core-oj-hostdex core-libart-hostdex okhttp-hostdex bouncycastle-hostdex core-junit-hostdex junit4-target-hostdex core-tests-support-hostdex mockito-api-hostdex
+    LOCAL_JAVA_LIBRARIES := core-oj-hostdex core-libart-hostdex okhttp-hostdex bouncycastle-hostdex junit-hostdex core-tests-support-hostdex mockito-api-hostdex
     LOCAL_STATIC_JAVA_LIBRARIES := sqlite-jdbc-host mockwebserver-host nist-pkix-tests-host core-test-rules-hostdex
     LOCAL_JAVACFLAGS := $(local_javac_flags)
     LOCAL_MODULE_TAGS := optional
@@ -375,7 +375,7 @@
     LOCAL_SRC_FILES := $(call all-test-java-files-under,support)
     LOCAL_JAVA_RESOURCE_DIRS := $(test_resource_dirs)
     LOCAL_NO_STANDARD_LIBRARIES := true
-    LOCAL_JAVA_LIBRARIES := core-oj-hostdex core-libart-hostdex core-junit-hostdex junit4-target-hostdex bouncycastle-hostdex
+    LOCAL_JAVA_LIBRARIES := core-oj-hostdex core-libart-hostdex junit-hostdex bouncycastle-hostdex
     LOCAL_STATIC_JAVA_LIBRARIES := bouncycastle-bcpkix-hostdex bouncycastle-ocsp-hostdex
     LOCAL_JAVACFLAGS := $(local_javac_flags)
     LOCAL_MODULE_TAGS := optional