diff options
| author | Paul Duffin <paulduffin@google.com> | 2016-11-30 14:32:54 +0000 |
|---|---|---|
| committer | Paul Duffin <paulduffin@google.com> | 2016-11-30 15:21:49 +0000 |
| commit | a2aa77deb4332b820636d6b7f630c5c535932b31 (patch) | |
| tree | e887e8fbf4756f6346623c176b19752b0773357b | |
| parent | 9300374b4f3eecf4a1a8e457175294600ed3bc89 (diff) | |
| download | junit-a2aa77deb4332b820636d6b7f630c5c535932b31.tar.gz | |
Reapply "Removed unused targets"
This reapplies commit 745e053b0b96f1b8ff30d93758be0441d9e78b93.
Test: make checkbuild
Change-Id: I81220f38b9d7fdede694331e457d88a166c39464
| -rw-r--r-- | Android.mk | 57 |
1 files changed, 0 insertions, 57 deletions
@@ -91,22 +91,6 @@ LOCAL_MODULE := core-junit-static LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk $(LOCAL_PATH)/Common.mk include $(BUILD_STATIC_JAVA_LIBRARY) -# ---------------------------------- -# build a core-junit-hostdex jar that contains exactly the same classes -# as core-junit. - -ifeq ($(HOST_OS),linux) -include $(CLEAR_VARS) -# TODO: remove extensions once apache-harmony/luni/ is no longer dependent -# on it -LOCAL_SRC_FILES := $(call all-java-files-under, src/junit/extensions) -LOCAL_SRC_FILES += $(core-junit-files) -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE := core-junit-hostdex -LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk $(LOCAL_PATH)/Common.mk -include $(BUILD_HOST_DALVIK_JAVA_LIBRARY) -endif # HOST_OS == linux - #------------------------------------------------------- # build a junit-runner jar for the host JVM # (like the junit classes in the frameworks/base android.test.runner.jar) @@ -121,19 +105,6 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk $(LOCAL_PATH)/Common.m include $(BUILD_STATIC_JAVA_LIBRARY) #------------------------------------------------------- -# build a junit-runner for the host dalvikvm -# (like the junit classes in the frameworks/base android.test.runner.jar) - -include $(CLEAR_VARS) -LOCAL_SRC_FILES := $(junit-runner-files) -LOCAL_MODULE := junit-runner-hostdex -LOCAL_MODULE_TAGS := optional -LOCAL_NO_STANDARD_LIBRARIES := true -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) - -#------------------------------------------------------- # build a junit4-target jar representing the # classes in external/junit that are not in the core public API 4 # Note: 'core' here means excluding the classes that are contained @@ -148,31 +119,3 @@ LOCAL_SDK_VERSION := 4 LOCAL_STATIC_JAVA_LIBRARIES := hamcrest LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk $(LOCAL_PATH)/Common.mk include $(BUILD_STATIC_JAVA_LIBRARY) - -#------------------------------------------------------- -# Same as above, but does not statically link in dependencies - -include $(CLEAR_VARS) -LOCAL_SRC_FILES := $(junit4-target-src) -LOCAL_MODULE := junit4-target-nodeps -LOCAL_MODULE_TAGS := optional -LOCAL_SDK_VERSION := 4 -LOCAL_JAVA_LIBRARIES := hamcrest -LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk $(LOCAL_PATH)/Common.mk -include $(BUILD_STATIC_JAVA_LIBRARY) - -#------------------------------------------------------- -# Same as above, but for host dalvik. However, since we don't have -# the SDK to provide the junit.framework.* classes, we must add -# an extra library. - -ifeq ($(HOST_OS),linux) -include $(CLEAR_VARS) -LOCAL_SRC_FILES := $(junit4-target-src) -LOCAL_MODULE := junit4-target-hostdex -LOCAL_MODULE_TAGS := optional -LOCAL_JAVA_LIBRARIES := core-junit-hostdex -LOCAL_STATIC_JAVA_LIBRARIES := hamcrest-hostdex -LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk $(LOCAL_PATH)/Common.mk -include $(BUILD_HOST_DALVIK_JAVA_LIBRARY) -endif # HOST_OS == linux |