commit 7dda7e1e81a638a63d1266f4cabb912a4a2cc1ec
author Paul Duffin <paulduffin@google.com> Tue Nov 29 10:12:51 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Nov 29 10:12:52 2016 +0000
tree 97a766446e89ccdc87bb8ab8061ed369f64718ee
parent 9309f1cbf308281be87b80cfbee7b61ba3725e78
parent 21cf84f8b3561d61e39d77cc00c520951f1ddd0f

Merge "Use junit-host instead of junit"

tools/layoutlib/create/tests/Android.mk

diff --git a/tools/layoutlib/create/tests/Android.mk b/tools/layoutlib/create/tests/Android.mk
index dafb9c6..61e381d 100644
--- a/tools/layoutlib/create/tests/Android.mk
+++ b/tools/layoutlib/create/tests/Android.mk
@@ -23,7 +23,7 @@
 LOCAL_MODULE := layoutlib-create-tests
 LOCAL_MODULE_TAGS := optional
 
-LOCAL_JAVA_LIBRARIES := layoutlib_create junit
+LOCAL_JAVA_LIBRARIES := layoutlib_create junit-host
 LOCAL_STATIC_JAVA_LIBRARIES := asm-5.0
 
 include $(BUILD_HOST_JAVA_LIBRARY)

tools/preload2/Android.mk

diff --git a/tools/preload2/Android.mk b/tools/preload2/Android.mk
index 09d95ff..769db6b 100644
--- a/tools/preload2/Android.mk
+++ b/tools/preload2/Android.mk
@@ -12,7 +12,7 @@
 
 # For JDWP access we use the framework in the JDWP tests from Apache Harmony, for
 # convenience (and to not depend on internal JDK APIs).
-LOCAL_STATIC_JAVA_LIBRARIES += apache-harmony-jdwp-tests-host junit
+LOCAL_STATIC_JAVA_LIBRARIES += apache-harmony-jdwp-tests-host junit-host
 
 LOCAL_MODULE:= preload2