diff options
| author | Przemyslaw Szczepaniak <pszczepaniak@google.com> | 2015-11-19 11:53:57 +0000 |
|---|---|---|
| committer | Przemyslaw Szczepaniak <pszczepaniak@google.com> | 2015-11-19 11:53:57 +0000 |
| commit | 5b903deb74ff89bdff3856a317c87999417ec89a (patch) | |
| tree | 0bdac7754dbbb5b287d3aa4d71fe686a228f0c51 /Android.mk | |
| parent | d6951321c5bb9aee536f930c00de209b29e620a7 (diff) | |
| download | junit-5b903deb74ff89bdff3856a317c87999417ec89a.tar.gz | |
Add core-oj to the list of dependencies
Change-Id: I99a3f78254051244cfffc9f4e40b6d2a03306403
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -39,7 +39,7 @@ LOCAL_SRC_FILES += $(junit-runner-files) # TODO: lose the suffix here and rename "junit" to "junit-hostdex" LOCAL_MODULE := junit-targetdex LOCAL_NO_STANDARD_LIBRARIES := true -LOCAL_JAVA_LIBRARIES := core-libart +LOCAL_JAVA_LIBRARIES := core-oj core-libart LOCAL_MODULE_TAGS := tests LOCAL_MODULE_PATH := $(TARGET_OUT_DATA)/junit LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk $(LOCAL_PATH)/Common.mk @@ -66,7 +66,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(call all-java-files-under, src/junit/extensions) LOCAL_SRC_FILES += $(core-junit-files) LOCAL_NO_STANDARD_LIBRARIES := true -LOCAL_JAVA_LIBRARIES := core-libart +LOCAL_JAVA_LIBRARIES := core-oj core-libart LOCAL_MODULE_TAGS := optional LOCAL_MODULE := core-junit LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk $(LOCAL_PATH)/Common.mk @@ -96,7 +96,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(junit-runner-files) LOCAL_MODULE := junit-runner LOCAL_NO_STANDARD_LIBRARIES := true -LOCAL_JAVA_LIBRARIES := core-libart core-junit +LOCAL_JAVA_LIBRARIES := core-oj core-libart core-junit LOCAL_MODULE_TAGS := optional LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk $(LOCAL_PATH)/Common.mk include $(BUILD_STATIC_JAVA_LIBRARY) @@ -110,7 +110,7 @@ LOCAL_SRC_FILES := $(junit-runner-files) LOCAL_MODULE := junit-runner-hostdex LOCAL_MODULE_TAGS := optional LOCAL_NO_STANDARD_LIBRARIES := true -LOCAL_JAVA_LIBRARIES := core-libart-hostdex core-junit-hostdex +LOCAL_JAVA_LIBRARIES := core-oj-hostdex core-libart-hostdex core-junit-hostdex LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk $(LOCAL_PATH)/Common.mk include $(BUILD_HOST_DALVIK_JAVA_LIBRARY) |