diff options
| author | Ian Rogers <irogers@google.com> | 2014-06-10 03:26:10 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-06-10 03:26:10 +0000 |
| commit | 2d073283b1a100d81b72cdbf07e898c5478bc3e0 (patch) | |
| tree | 148a0e1b57dacf951cb484e666eec43e9cfb4119 | |
| parent | 9d96ec477b50480702d8d7167d0bfb391147878d (diff) | |
| parent | 3994084b8d90ab1d1c7ab9c444de606a8c01f24a (diff) | |
| download | junit-2d073283b1a100d81b72cdbf07e898c5478bc3e0.tar.gz | |
Merge "Remove deprecated WITH_HOST_DALVIK."
| -rw-r--r-- | Android.mk | 6 |
1 files changed, 0 insertions, 6 deletions
@@ -45,7 +45,6 @@ include $(BUILD_JAVA_LIBRARY) # ---------------------------------- # build a junit-hostdex jar -ifeq ($(WITH_HOST_DALVIK),true) include $(CLEAR_VARS) LOCAL_SRC_FILES := $(call all-java-files-under, src/junit/extensions) LOCAL_SRC_FILES += $(core-junit-files) @@ -53,7 +52,6 @@ LOCAL_SRC_FILES += $(junit-runner-files) LOCAL_MODULE := junit-hostdex LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk $(LOCAL_PATH)/Common.mk include $(BUILD_HOST_DALVIK_JAVA_LIBRARY) -endif # ---------------------------------- # build a core-junit target jar that is built into Android system image @@ -74,7 +72,6 @@ include $(BUILD_JAVA_LIBRARY) # build a core-junit-hostdex jar that contains exactly the same classes # as core-junit. -ifeq ($(WITH_HOST_DALVIK),true) include $(CLEAR_VARS) # TODO: remove extensions once apache-harmony/luni/ is no longer dependent # on it @@ -85,7 +82,6 @@ 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 #------------------------------------------------------- # build a junit-runner jar for the host JVM @@ -102,7 +98,6 @@ 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) -ifeq ($(WITH_HOST_DALVIK),true) include $(CLEAR_VARS) LOCAL_SRC_FILES := $(junit-runner-files) LOCAL_MODULE := junit-runner-hostdex @@ -110,7 +105,6 @@ LOCAL_MODULE_TAGS := optional LOCAL_JAVA_LIBRARIES := core-junit-hostdex LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk $(LOCAL_PATH)/Common.mk include $(BUILD_HOST_DALVIK_JAVA_LIBRARY) -endif #------------------------------------------------------- # build a junit4-target jar representing the |