aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Duffin <paulduffin@google.com>2016-12-13 09:34:58 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2016-12-13 09:34:59 +0000
commit3a86064f04f2933102d7cb0e17165c3b76303c1a (patch)
tree1f52a57c04252db12bccab80d4edde860ae0684f
parent88052a150a3e605df7bc71a0f4571719e1f896a9 (diff)
parent79e656acacc7e1fa4257836b38987ec7816cbf6c (diff)
downloadjunit-3a86064f04f2933102d7cb0e17165c3b76303c1a.tar.gz
Merge "Remove junit-targetdex as it is no longer used"
-rw-r--r--Android.mk14
1 files changed, 0 insertions, 14 deletions
diff --git a/Android.mk b/Android.mk
index 81db17d..42ce6eb 100644
--- a/Android.mk
+++ b/Android.mk
@@ -43,20 +43,6 @@ LOCAL_STATIC_JAVA_LIBRARIES := hamcrest-host
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk $(LOCAL_PATH)/Common.mk
include $(BUILD_HOST_JAVA_LIBRARY)
-# ----------------------------------
-# build a junit-targetdex jar
-
-include $(CLEAR_VARS)
-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_MODULE_TAGS := tests
-LOCAL_STATIC_JAVA_LIBRARIES := hamcrest
-# The following is needed by external/apache-harmony/jdwp/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)
-
# build a junit-hostdex jar
# -------------------------