diff options
| author | Paul Duffin <paulduffin@google.com> | 2016-12-09 07:45:41 +0000 |
|---|---|---|
| committer | Paul Duffin <paulduffin@google.com> | 2016-12-09 11:20:23 +0000 |
| commit | 8610444b6b53934ca36bfad31b7bd649fc3e201b (patch) | |
| tree | ba72998582a36e610c2d4bf089c6bbcefba4aa7f /Android.mk | |
| parent | 076c475e798224b0dde260c538745192ceb6e07d (diff) | |
| download | junit-8610444b6b53934ca36bfad31b7bd649fc3e201b.tar.gz | |
Use SDK 25 to build JUnit instead of core-libart
Some users of the junit target cannot build core-libart/core-oj
due to limitations of their build environment. They must be
using the junit4-target as that is the only JUnit target that
builds against the SDK. As this is being used to replace the
junit4-target it should be built in the same way.
Switching to use the latest version, 25, of the SDK. Cannot use
current as it has dependencies on other targets that are also
not in the affected build environments.
Bug: 30188076
Test: make checkbuild
Change-Id: I674b8a5be800e2d4124c6db423e3261d22d3212e
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -25,12 +25,11 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_MODULE := junit LOCAL_MODULE_TAGS := tests +LOCAL_SDK_VERSION := 25 LOCAL_STATIC_JAVA_LIBRARIES := hamcrest -LOCAL_JAVA_LIBRARIES := core-oj core-libart # 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 -LOCAL_NO_STANDARD_LIBRARIES := true include $(BUILD_STATIC_JAVA_LIBRARY) # build a junit-host jar @@ -122,7 +121,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(junit4-target-src) LOCAL_MODULE := junit4-target LOCAL_MODULE_TAGS := optional -LOCAL_SDK_VERSION := 4 +LOCAL_SDK_VERSION := 25 LOCAL_STATIC_JAVA_LIBRARIES := hamcrest LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk $(LOCAL_PATH)/Common.mk include $(BUILD_STATIC_JAVA_LIBRARY) |