aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Duffin <paulduffin@google.com>2017-01-21 01:13:54 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-01-21 01:13:54 +0000
commitbbbc818f31a7553a6202e6063f079703f897356d (patch)
treea52caa4fb6dad4aa4bfd7e1f1408863483320e9d
parent83b9cd93361f0d6d39e04cd3c1ba1475edbac673 (diff)
parente3b284d3c4d969e3711719da0e7ef493b91c1342 (diff)
downloadjunit-bbbc818f31a7553a6202e6063f079703f897356d.tar.gz
Merge "Remove junit4-target" am: 7323bf635e am: 3151d40422
am: e3b284d3c4 Change-Id: Iaf02f33a44a3b52bb7917d0a1ced162f1e0b14d4
-rw-r--r--Android.mk11
1 files changed, 0 insertions, 11 deletions
diff --git a/Android.mk b/Android.mk
index 10f826a..77dd2de 100644
--- a/Android.mk
+++ b/Android.mk
@@ -52,14 +52,3 @@ LOCAL_STATIC_JAVA_LIBRARIES := hamcrest-hostdex
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
include $(BUILD_HOST_DALVIK_STATIC_JAVA_LIBRARY)
endif # HOST_OS == linux
-
-#-------------------------------------------------------
-# build a junit4-target jar as an alias for junit
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := junit4-target
-LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := 25
-LOCAL_STATIC_JAVA_LIBRARIES := junit hamcrest
-LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
-include $(BUILD_STATIC_JAVA_LIBRARY)