diff options
| author | Paul Duffin <paulduffin@google.com> | 2016-12-07 13:14:59 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-12-07 13:14:59 +0000 |
| commit | db7a50e206be4fd057f762ffa7ca5632f2ebf782 (patch) | |
| tree | 19c41e1299be673fcc3134038cbe7f6cf8f1be31 | |
| parent | 82e424638b54b63ff6b4a5a5cb30a61ee9d90dab (diff) | |
| parent | cf58473ad9339e3d6736eb726f524408a22dc6ab (diff) | |
| download | apache-harmony-db7a50e206be4fd057f762ffa7ca5632f2ebf782.tar.gz | |
Merge "Replace junit-targetdex with junit" am: a9de4c7708 am: b95d76c198
am: cf58473ad9
Change-Id: I95a3dd82b628cc86e6da1b4af2c2973825e27854
| -rw-r--r-- | Android.mk | 2 | ||||
| -rw-r--r-- | jdwp/Android.mk | 4 | ||||
| -rw-r--r-- | jdwp/Android_debug_config.mk | 4 |
3 files changed, 5 insertions, 5 deletions
@@ -39,7 +39,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(harmony_test_src_files) LOCAL_JAVA_RESOURCE_DIRS := $(harmony_test_resource_dirs) LOCAL_NO_STANDARD_LIBRARIES := true -LOCAL_JAVA_LIBRARIES := core-oj core-libart junit-targetdex +LOCAL_JAVA_LIBRARIES := core-oj core-libart junit LOCAL_JAVACFLAGS := $(harmony_test_javac_flags) LOCAL_MODULE := apache-harmony-tests LOCAL_JARJAR_RULES := $(LOCAL_PATH)/jarjar-rules.txt diff --git a/jdwp/Android.mk b/jdwp/Android.mk index 63ef361..4fe4066 100644 --- a/jdwp/Android.mk +++ b/jdwp/Android.mk @@ -28,7 +28,7 @@ cts_jdwp_test_target_runtime_args += -Djpda.settings.debuggeeJavaPath='$(cts_jdw include $(CLEAR_VARS) LOCAL_SRC_FILES := $(harmony_jdwp_test_src_files) -LOCAL_JAVA_LIBRARIES := junit-targetdex +LOCAL_JAVA_LIBRARIES := junit LOCAL_MODULE_TAGS := optional LOCAL_MODULE := CtsJdwp LOCAL_NO_EMMA_INSTRUMENT := true @@ -39,7 +39,7 @@ include $(BUILD_CTS_TARGET_JAVA_LIBRARY) include $(CLEAR_VARS) LOCAL_SRC_FILES := $(harmony_jdwp_test_src_files) -LOCAL_JAVA_LIBRARIES := junit-targetdex +LOCAL_JAVA_LIBRARIES := junit LOCAL_MODULE_TAGS := tests LOCAL_MODULE := apache-harmony-jdwp-tests LOCAL_NO_EMMA_INSTRUMENT := true diff --git a/jdwp/Android_debug_config.mk b/jdwp/Android_debug_config.mk index 7f75592..67dbd6f 100644 --- a/jdwp/Android_debug_config.mk +++ b/jdwp/Android_debug_config.mk @@ -20,7 +20,7 @@ # to investigate failures during testing. # Target settings -jdwp_test_classpath_target := /data/jdwp/apache-harmony-jdwp-tests.jar:/data/junit/junit-targetdex.jar +jdwp_test_classpath_target := /data/jdwp/apache-harmony-jdwp-tests.jar:/data/junit/junit.jar jdwp_test_runtime_bin_target := dalvikvm # Host settings @@ -72,7 +72,7 @@ jdwp_tests_host_dependencies := \ jdwp_tests_target_dependencies := \ $(TARGET_OUT_DATA)/jdwp/apache-harmony-jdwp-tests.jar \ - $(TARGET_OUT_DATA)/junit/junit-targetdex.jar + $(TARGET_OUT_DATA)/junit/junit.jar # Define a JDWP host rule # |