diff options
| author | Paul Duffin <paulduffin@google.com> | 2016-11-29 11:12:15 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-11-29 11:12:15 +0000 |
| commit | 924ea5919a9cf48811ad5ba58524f509982d6b7b (patch) | |
| tree | 585e3c3f1f1db64a44c9070e81c831dafc7be1a8 | |
| parent | 12e99b4f5ee2d6f5a904b0aa06a5e407a65f7e84 (diff) | |
| parent | 172e38f556e890d9f6dfcc06e2434852e5383f9d (diff) | |
| download | junit-924ea5919a9cf48811ad5ba58524f509982d6b7b.tar.gz | |
Merge "Change junit-targetdex to contain all JUnit classes"
am: 172e38f556
Change-Id: I6a50e230fa468be31946b8a1007a20d08c39a76e
| -rw-r--r-- | Android.mk | 8 |
1 files changed, 3 insertions, 5 deletions
@@ -41,14 +41,12 @@ include $(BUILD_HOST_JAVA_LIBRARY) # build a junit-targetdex jar include $(CLEAR_VARS) -LOCAL_SRC_FILES := $(call all-java-files-under, src/junit/extensions) -LOCAL_SRC_FILES += $(core-junit-files) -LOCAL_SRC_FILES += $(junit-runner-files) +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_NO_STANDARD_LIBRARIES := true -LOCAL_JAVA_LIBRARIES := core-oj core-libart LOCAL_MODULE_TAGS := tests +LOCAL_STATIC_JAVA_LIBRARIES := hamcrest +# The following is needed by external/apache-harmony/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) |