From 11ef97617f5c214ff358316ceda2cfac2e67dd5d Mon Sep 17 00:00:00 2001 From: Paul Duffin <paulduffin@google.com> Date: Mon, 28 Nov 2016 16:46:39 +0000 Subject: [PATCH] Use junit-host instead of junit Bug: 30188076 Test: make checkbuild Change-Id: Ib42d9a3d81b13cc75ce7fe19f9e28832b9f3177f --- Android.mk | 2 +- tests/Android.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Android.mk b/Android.mk index 99b1ddd..b3b086e 100644 --- a/Android.mk +++ b/Android.mk @@ -23,7 +23,7 @@ LOCAL_JAVACFLAGS += -g -Xlint LOCAL_MODULE := loganalysis LOCAL_MODULE_TAGS := optional -LOCAL_STATIC_JAVA_LIBRARIES := guava-18.0-prebuilt json-prebuilt junit +LOCAL_STATIC_JAVA_LIBRARIES := guava-18.0-prebuilt json-prebuilt junit-host include $(BUILD_HOST_JAVA_LIBRARY) diff --git a/tests/Android.mk b/tests/Android.mk index 32019a7..d5e8881 100644 --- a/tests/Android.mk +++ b/tests/Android.mk @@ -23,7 +23,7 @@ LOCAL_JAVACFLAGS += -g -Xlint LOCAL_MODULE := loganalysis-tests LOCAL_MODULE_TAGS := optional -LOCAL_STATIC_JAVA_LIBRARIES := easymock junit +LOCAL_STATIC_JAVA_LIBRARIES := easymock junit-host LOCAL_JAVA_LIBRARIES := loganalysis include $(BUILD_HOST_JAVA_LIBRARY) -- GitLab