diff options
| author | Paul Duffin <paulduffin@google.com> | 2016-11-25 18:18:04 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-11-25 18:18:04 +0000 |
| commit | 918ee8c0a0178e7e04d8c649f4331464e17bf2ae (patch) | |
| tree | cbdd30e06eb11ff0df2e80a33f63c8acf14ab697 | |
| parent | c595c3cdb9a34fa02635e34ffa82c60fb894ac39 (diff) | |
| parent | 5cf160ee9a022e1172794e070896769c724150ae (diff) | |
| download | junit-918ee8c0a0178e7e04d8c649f4331464e17bf2ae.tar.gz | |
Merge "Add junit-host and make junit an alias for it"
am: 5cf160ee9a
Change-Id: Iaafbaaab91b0dfe3252b288010345723162cef1a
| -rw-r--r-- | Android.mk | 14 |
1 files changed, 11 insertions, 3 deletions
@@ -19,12 +19,20 @@ LOCAL_PATH := $(call my-dir) # include definition of core-junit-files include $(LOCAL_PATH)/Common.mk -# note: ideally this should be junit-host, but leave as is for now to avoid -# changing all its dependencies +# note: this is deprecated in favour of junit-host; this will be removed soon. include $(CLEAR_VARS) -LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_MODULE := junit LOCAL_MODULE_TAGS := optional +LOCAL_STATIC_JAVA_LIBRARIES := junit-host +include $(BUILD_HOST_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_STATIC_JAVA_LIBRARIES := hamcrest-host LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk $(LOCAL_PATH)/Common.mk include $(BUILD_HOST_JAVA_LIBRARY) |