diff options
| author | Paul Duffin <paulduffin@google.com> | 2016-12-07 12:53:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-12-07 12:53:59 +0000 |
| commit | 18106331dccb113e65d24f8a93f3393c00212fad (patch) | |
| tree | 36f2aa6924efdfaa741aa740692603b1d0688bab | |
| parent | 01047fd4865bf655debf2d68a648c2099d91059b (diff) | |
| parent | 4dabb510b8a1b07396d0287da2830c68e148dc5c (diff) | |
| download | junit-18106331dccb113e65d24f8a93f3393c00212fad.tar.gz | |
Merge "Add junit target as replacement for junit-targetdex"
| -rw-r--r-- | Android.mk | 16 |
1 files changed, 14 insertions, 2 deletions
@@ -19,13 +19,25 @@ LOCAL_PATH := $(call my-dir) # include definition of core-junit-files include $(LOCAL_PATH)/Common.mk +# build a junit jar +# ---------------------- +include $(CLEAR_VARS) +LOCAL_SRC_FILES := $(call all-java-files-under, src) +LOCAL_MODULE := junit +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_STATIC_JAVA_LIBRARY) + # build a junit-host jar # ---------------------- include $(CLEAR_VARS) LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_MODULE := junit-host -LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_TAGS := tests LOCAL_STATIC_JAVA_LIBRARIES := hamcrest-host LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk $(LOCAL_PATH)/Common.mk include $(BUILD_HOST_JAVA_LIBRARY) @@ -39,7 +51,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_MODULE := junit-targetdex LOCAL_MODULE_TAGS := tests LOCAL_STATIC_JAVA_LIBRARIES := hamcrest -# The following is needed by external/apache-harmony/Android_debug_config.mk +# 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) |