summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--jack-tests/Android.mk54
-rw-r--r--jack-tests/build/run-test-common.mk27
-rw-r--r--jack-tests/build/run-test.mk166
-rw-r--r--jack-tests/build/test.mk20
-rw-r--r--jack-tests/tests/com/android/jack/debug/test001/test.mk6
-rw-r--r--jack-tests/tests/com/android/jack/enums/test003/test.mk8
-rw-r--r--jack-tests/tests/com/android/jack/jarjar/test001/test.mk8
-rw-r--r--jack-tests/tests/com/android/jack/jarjar/test003/test.mk8
-rw-r--r--jack-tests/tests/com/android/jack/opcodes/test-opcodes.mk424
-rw-r--r--jack-tests/tests/com/android/jack/shrob/test011/test.mk8
-rw-r--r--jack-tests/tests/com/android/jack/shrob/test011/test2.mk8
-rw-r--r--jack-tests/tests/com/android/jack/shrob/test016/test.mk10
-rw-r--r--jack-tests/tests/com/android/jack/shrob/test025/test.mk8
-rw-r--r--jack-tests/tests/com/android/jack/shrob/test030/test.mk8
-rw-r--r--jack/Android.mk15
15 files changed, 366 insertions, 412 deletions
diff --git a/jack-tests/Android.mk b/jack-tests/Android.mk
index 2cb921d0..74c32111 100644
--- a/jack-tests/Android.mk
+++ b/jack-tests/Android.mk
@@ -14,16 +14,38 @@
private_jack_tests_mk := $(lastword $(MAKEFILE_LIST))
-LOCAL_PATH:= $(call my-dir)
+JACK_PATH:= $(call my-dir)
+
+$(test-jack-incremental): PRIVATE_JACK_VM_ARGS := $(DEFAULT_JACK_VM_ARGS)
+ifneq ($(ANDROID_JACK_VM_ARGS),)
+$(test-jack-incremental): PRIVATE_JACK_VM_ARGS := $(ANDROID_JACK_VM_ARGS)
+endif
+ifneq ($(LOCAL_JACK_VM_ARGS),)
+$(test-jack-incremental): PRIVATE_JACK_VM_ARGS := $(LOCAL_JACK_VM_ARGS)
+endif
+
+$(test-jack-incremental): PRIVATE_JACK_EXTRA_ARGS := $(DEFAULT_JACK_EXTRA_ARGS)
+ifneq ($(ANDROID_JACK_EXTRA_ARGS),)
+$(test-jack-incremental): PRIVATE_JACK_EXTRA_ARGS := $(ANDROID_JACK_EXTRA_ARGS)
+endif
+ifneq ($(LOCAL_JACK_EXTRA_ARGS),)
+$(test-jack-incremental): PRIVATE_JACK_EXTRA_ARGS := $(LOCAL_JACK_EXTRA_ARGS)
+endif
+
+$(test-jack-incremental): PRIVATE_JACK_VM := $(DEFAULT_JACK_VM)
+ifneq ($(strip $(ANDROID_JACK_VM)),)
+$(test-jack-incremental): PRIVATE_JACK_VM := $(ANDROID_JACK_VM)
+endif
test-jack-incremental: $(JACK_JAR)
$(hide) $(eval TEMPDIR_DEX_FROM_JAVA := $(shell mktemp -d))
$(hide) $(eval TEMPDIR_DEX_FROM_JACK := $(shell mktemp -d))
- $(hide) $(JACK) -D jack.jackfile.generate=true -D jack.jackfile.output.container=dir \
+ $(hide) $(call call-jack,$(PRIVATE_JACK_VM),$(PRIVATE_JACK_VM_ARGS),$(PRIVATE_JACK_EXTRA_ARGS)) \
+ -D jack.jackfile.generate=true -D jack.jackfile.output.container=dir \
-D jack.jackfile.output.dir=$(TEMPDIR_DEX_FROM_JAVA)/jackIncrementalOutput -o \
$(TEMPDIR_DEX_FROM_JAVA) \
--ecj -nowarn @$(ANDROID_BUILD_TOP)/out/target/common/obj/JAVA_LIBRARIES/core_intermediates/sources.list
- $(hide) $(JACK) \
+ $(hide) $(call call-jack,$(PRIVATE_JACK_VM),$(PRIVATE_JACK_VM_ARGS),$(PRIVATE_JACK_EXTRA_ARGS)) \
--output $(TEMPDIR_DEX_FROM_JACK) --import-jack $(TEMPDIR_DEX_FROM_JAVA)/jackIncrementalOutput
$(hide) dexdump -d $(TEMPDIR_DEX_FROM_JAVA)/classes.dex | tail -n +3 &> $(TEMPDIR_DEX_FROM_JAVA)/coreDexFromJava.txt
$(hide) dexdump -d $(TEMPDIR_DEX_FROM_JACK)/classes.dex | tail -n +3 &> $(TEMPDIR_DEX_FROM_JACK)/coreDexFromJack.txt
@@ -41,8 +63,7 @@ test-jack-all: test-jack-unit-all test-jack-incremental test-jack-regression
#################
# tests executing the created dex
#################
-JACK_PATH := $(LOCAL_PATH)
-include $(LOCAL_PATH)/build/run-test-common.mk
+include $(JACK_PATH)/build/run-test-common.mk
# tests suites
@@ -110,7 +131,7 @@ $(call declare-test-with-name,constant/test007)
$(call declare-test-with-name,constant/clazz)
# Debug info
-$(call declare-test,$(LOCAL_PATH)/tests/com/android/jack/debug/test001/test.mk)
+$(call declare-test,$(JACK_PATH)/tests/com/android/jack/debug/test001/test.mk)
$(call declare-test-with-name,debug/test002)
$(call declare-test-with-name,debug/test004)
@@ -122,7 +143,7 @@ $(call declare-test-with-name,dx/overlapping)
# Enum
$(call declare-test-with-name,enums/test001)
$(call declare-test-with-name,enums/test002)
-$(call declare-test,$(LOCAL_PATH)/tests/com/android/jack/enums/test003/test.mk)
+$(call declare-test,$(JACK_PATH)/tests/com/android/jack/enums/test003/test.mk)
# Conditional
$(call declare-test-with-name,conditional/test001)
@@ -205,8 +226,8 @@ $(call declare-test-with-name,invoke/test006)
$(call declare-test-with-name,invoke/test007)
# Jarjar
-$(call declare-test,$(LOCAL_PATH)/tests/com/android/jack/jarjar/test001/test.mk)
-$(call declare-test,$(LOCAL_PATH)/tests/com/android/jack/jarjar/test003/test.mk)
+$(call declare-test,$(JACK_PATH)/tests/com/android/jack/jarjar/test001/test.mk)
+$(call declare-test,$(JACK_PATH)/tests/com/android/jack/jarjar/test003/test.mk)
# Newarray
$(call declare-test-with-name,newarray/test001)
@@ -219,7 +240,7 @@ $(call declare-test-with-name,optimizations/notsimplifier/test001)
$(call declare-test-with-name,optimizations/exprsimplifier/test001)
# Opcode
-$(call declare-test,$(LOCAL_PATH)/tests/com/android/jack/opcodes/test-opcodes.mk)
+$(call declare-test,$(JACK_PATH)/tests/com/android/jack/opcodes/test-opcodes.mk)
# Order
$(call declare-test-with-name,order)
@@ -229,11 +250,11 @@ $(call declare-test-with-name,returnstatement/returnvoid)
$(call declare-test-with-name,returnstatement/returns)
# Shrob
-#$(call declare-test,$(LOCAL_PATH)/tests/com/android/jack/shrob/test011/test.mk)
-$(call declare-test,$(LOCAL_PATH)/tests/com/android/jack/shrob/test011/test2.mk)
-$(call declare-test,$(LOCAL_PATH)/tests/com/android/jack/shrob/test016/test.mk)
-$(call declare-test,$(LOCAL_PATH)/tests/com/android/jack/shrob/test025/test.mk)
-$(call declare-test,$(LOCAL_PATH)/tests/com/android/jack/shrob/test030/test.mk)
+#$(call declare-test,$(JACK_PATH)/tests/com/android/jack/shrob/test011/test.mk)
+$(call declare-test,$(JACK_PATH)/tests/com/android/jack/shrob/test011/test2.mk)
+$(call declare-test,$(JACK_PATH)/tests/com/android/jack/shrob/test016/test.mk)
+$(call declare-test,$(JACK_PATH)/tests/com/android/jack/shrob/test025/test.mk)
+$(call declare-test,$(JACK_PATH)/tests/com/android/jack/shrob/test030/test.mk)
# String
$(call declare-test-with-name,string/concat001)
@@ -309,9 +330,6 @@ JAVA_COMPILER := $(COMMON_JAVAC)
include $(JACK_RUN_TEST)
test-jack: test-jack-$(JACKTEST_MODULE)
$(hide) echo test-jack: PASSED
-ifeq ($(JAVA7_COMPILER),)
- $(hide) echo test-jack: Missing Java 7 compiler, Java 7 tests Skipped, export Java 7 compiler into JAVA7_COMPILER
-endif
include $(CLEAR_VARS)
diff --git a/jack-tests/build/run-test-common.mk b/jack-tests/build/run-test-common.mk
index 33d106a0..28d1f269 100644
--- a/jack-tests/build/run-test-common.mk
+++ b/jack-tests/build/run-test-common.mk
@@ -25,7 +25,7 @@ $(call _java-lib-dir,$(1),$(2))/classes.dex
endef
jack.intermediate := $(call intermediates-dir-for,JAVA_LIBRARIES,jack,1,COMMON)
-BOOTCLASSPATH_MODULE := core-libart-hostdex junit4-hostdex-jack
+BOOTCLASSPATH_MODULE := core-libart-hostdex
BOOTCLASSPATH_LIBS := $(call java-lib-files,$(BOOTCLASSPATH_MODULE),true)
BOOTCLASSPATH_DEX := $(call java-dex-files,$(BOOTCLASSPATH_MODULE),true)
junit.dex = \
@@ -46,7 +46,7 @@ define declare-test-with-name
$(eval include $(JACK_CLEAR_VARS)) \
$(eval JAVA_COMPILER := $(COMMON_JAVAC)) \
$(eval JACKTEST_MODULE := $$(1)) \
-$(eval JACKTEST_MODULE_PATH := $(JACK_PATH)/tests/com/android/jack/$$(1)) \
+$(eval JACKTEST_MODULE_PATH := tests/com/android/jack/$$(1)) \
$(eval include $(JACK_PATH)/build/test.mk)
endef
@@ -54,25 +54,8 @@ endef
define declare-java7-test-with-name
$(eval include $(JACK_CLEAR_VARS)) \
$(eval JACKTEST_SOURCE_JAVA7 := -D jack.java.source.version=1.7) \
-$(eval JAVA_COMPILER := $(JAVA7_COMPILER)) \
+$(eval JAVA_COMPILER := $(COMMON_JAVAC)) \
$(eval JACKTEST_MODULE := $$(1)) \
-$(eval JACKTEST_MODULE_PATH := $(JACK_PATH)/tests/com/android/jack/$$(1)) \
-$(if $(JAVA7_COMPILER), $(eval include $(JACK_PATH)/build/test.mk), $(warning Ignoring test $(1), Missing Java 7 compiler, export Java 7 compiler into JAVA7_COMPILER))
-endef
-
-define transform-classes.jar-to-dex-with-dx-origin
-@echo "target Dex: $(PRIVATE_MODULE)"
-@mkdir -p $(dir $@)
-$(hide) $(DX_ORIGIN) \
- --dex \
- --output=$@ \
- $(incremental_dex) \
- $(if $(NO_OPTIMIZE_DX), \
- --no-optimize) \
- $(if $(GENERATE_DEX_DEBUG), \
-» --debug --verbose \
-» --dump-to=$(@:.dex=.lst) \
-» --dump-width=1000) \
- $(PRIVATE_DX_FLAGS) \
- $<
+$(eval JACKTEST_MODULE_PATH := tests/com/android/jack/$$(1)) \
+$(eval include $(JACK_PATH)/build/test.mk)
endef
diff --git a/jack-tests/build/run-test.mk b/jack-tests/build/run-test.mk
index e49b8f73..77ba200e 100644
--- a/jack-tests/build/run-test.mk
+++ b/jack-tests/build/run-test.mk
@@ -12,19 +12,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-JACKTEST_INTERMEDIATE_DIR := $(jack.intermediate)/$(JACKTEST_MODULE)
-
-JACKTEST_LIB_JAR := $(if $(strip $(JACKTEST_LIB_SRC)),$(JACKTEST_INTERMEDIATE_DIR)/lib/classes.jar,)
-JACKTEST_LIB_DEX := $(if $(strip $(JACKTEST_LIB_SRC)),$(ANDROID_BUILD_TOP)/$(JACKTEST_INTERMEDIATE_DIR)/lib/classes.dex,)
-
-JACKTEST_WITHJACK_JAR := $(JACKTEST_INTERMEDIATE_DIR)/withjack/classes.jar
-JACKTEST_WITHJACK_DEX := $(ANDROID_BUILD_TOP)/$(JACKTEST_INTERMEDIATE_DIR)/withjack/classes.dex
-
-JACKTEST_LINK_DEX := $(if $(strip $(JACKTEST_LINK_SRC)),$(ANDROID_BUILD_TOP)/$(JACKTEST_INTERMEDIATE_DIR)/link/classes.dex,)
-
-JACKTEST_WITHDX_JAR := $(JACKTEST_INTERMEDIATE_DIR)/withdx/classes.jar
-JACKTEST_WITHDX_DEX := $(ANDROID_BUILD_TOP)/$(JACKTEST_INTERMEDIATE_DIR)/withdx/classes.dex
-
ifeq ($(JACKTEST_ARGS)$(JACKTEST_DALVIK_FLAGS)$(JACKTEST_SOURCE_JAVA7),)
JACKREGRESSIONTEST_WITHJACK_SRC := $(JACKREGRESSIONTEST_WITHJACK_SRC) $(JACKTEST_WITHJACK_SRC)
JACKREGRESSIONTEST_LINK_SRC := $(JACKREGRESSIONTEST_LINK_SRC) $(JACKTEST_LINK_SRC)
@@ -39,99 +26,68 @@ ifneq ($(JACKTEST_MODULE),regression)
test-jack-one-by-one: test-jack-$(JACKTEST_MODULE)
endif
-jack_test_lib_sources_list := $(JACKTEST_INTERMEDIATE_DIR)/lib/$(JACKTEST_MODULE)_lib_sources.list
-$(jack_test_lib_sources_list): PRIVATE_JAVA_SOURCES := $(JACKTEST_LIB_SRC)
-$(jack_test_lib_sources_list): PRIVATE_SOURCE_INTERMEDIATES_DIR :=
-$(jack_test_lib_sources_list): $(JACKTEST_LIB_SRC)
- $(call create-source-list)
-
-jack_test_with_jack_sources_list := $(JACKTEST_INTERMEDIATE_DIR)/withjack/$(JACKTEST_MODULE)_with_jack_sources.list
-$(jack_test_with_jack_sources_list): PRIVATE_JAVA_SOURCES := $(JACKTEST_WITHJACK_SRC)
-$(jack_test_with_jack_sources_list): PRIVATE_SOURCE_INTERMEDIATES_DIR :=
-$(jack_test_with_jack_sources_list): $(JACKTEST_WITHJACK_SRC)
- $(call create-source-list)
-
-jack_test_with_dx_sources_list := $(JACKTEST_INTERMEDIATE_DIR)/withdx/$(JACKTEST_MODULE)_with_dx_sources.list
-$(jack_test_with_dx_sources_list): PRIVATE_JAVA_SOURCES := $(JACKTEST_WITHDX_SRC)
-$(jack_test_with_dx_sources_list): PRIVATE_SOURCE_INTERMEDIATES_DIR :=
-$(jack_test_with_dx_sources_list): $(JACKTEST_WITHDX_SRC)
- $(call create-source-list)
-
-local_bootclasspath := \
- $(addprefix -bootclasspath ,$(call normalize-path-list,$(BOOTCLASSPATH_LIBS)))
-local_bootclasspath_jack := \
- $(addprefix --bootclasspath ,$(call normalize-path-list,$(BOOTCLASSPATH_LIBS)))
-
-$(JACKTEST_LIB_JAR): PRIVATE_JACK_DEBUG_FLAGS := -g
-$(JACKTEST_LIB_JAR): PRIVATE_JAVA_SOURCES := $(JACKTEST_LIB_SRC)
-$(JACKTEST_LIB_JAR): PRIVATE_STATIC_JAVA_LIBRARIES :=
-$(JACKTEST_LIB_JAR): PRIVATE_ALL_JAVA_LIBRARIES :=
-$(JACKTEST_LIB_JAR): PRIVATE_SOURCE_INTERMEDIATES_DIR :=
-$(JACKTEST_LIB_JAR): PRIVATE_MODULE := jacktest_$(JACKTEST_MODULE)_lib
-$(JACKTEST_LIB_JAR): PRIVATE_CLASS_INTERMEDIATES_DIR := $(JACKTEST_INTERMEDIATE_DIR)/lib/classes
-$(JACKTEST_LIB_JAR): PRIVATE_BOOTCLASSPATH := $(local_bootclasspath)
-$(JACKTEST_LIB_JAR): PRIVATE_SOURCES_LIST := $(jack_test_lib_sources_list)
-$(JACKTEST_LIB_JAR): PRIVATE_JAVACFLAGS := -nowarn
-$(JACKTEST_LIB_JAR): $(JACKTEST_LIB_SRC) $(BOOTCLASSPATH_LIBS) $(PRIVATE_TEST_MK) $(jack_test_lib_sources_list) $(JACK_JAR)
- $(transform-host-java-to-package-with-jack)
-$(JACKTEST_LIB_DEX): PRIVATE_MODULE := jacktest_$(JACKTEST_MODULE)_lib
-$(JACKTEST_LIB_DEX): PRIVATE_INTERMEDIATES_DIR := $(JACKTEST_INTERMEDIATE_DIR)/lib
-$(JACKTEST_LIB_DEX): PRIVATE_DX_FLAGS :=
-$(JACKTEST_LIB_DEX): $(JACKTEST_LIB_JAR) $(JACK_JAR) $(JILL_JAR)
- $(transform-classes.jar-to-dex)
-
-$(JACKTEST_WITHJACK_JAR): PRIVATE_JACK_DEBUG_FLAGS := -g
-$(JACKTEST_WITHJACK_JAR): PRIVATE_JAVA_SOURCES := $(JACKTEST_WITHJACK_SRC)
-$(JACKTEST_WITHJACK_JAR): PRIVATE_STATIC_JAVA_LIBRARIES :=
-$(JACKTEST_WITHJACK_JAR): PRIVATE_ALL_JAVA_LIBRARIES := $(JACKTEST_LIB_JAR)
-$(JACKTEST_WITHJACK_JAR): PRIVATE_SOURCE_INTERMEDIATES_DIR :=
-$(JACKTEST_WITHJACK_JAR): PRIVATE_MODULE := jacktest_$(JACKTEST_MODULE)_withjack
-$(JACKTEST_WITHJACK_JAR): PRIVATE_CLASS_INTERMEDIATES_DIR := $(JACKTEST_INTERMEDIATE_DIR)/withjack/classes
-$(JACKTEST_WITHJACK_JAR): PRIVATE_BOOTCLASSPATH := $(local_bootclasspath)
-$(JACKTEST_WITHJACK_JAR): PRIVATE_SOURCES_LIST := $(jack_test_with_jack_sources_list)
-$(JACKTEST_WITHJACK_JAR): PRIVATE_JAVACFLAGS := -nowarn
-$(JACKTEST_WITHJACK_JAR): PRIVATE_JACK_FLAGS := $(JACKTEST_SOURCE_JAVA7)
-$(JACKTEST_WITHJACK_JAR): COMMON_JAVAC := $(JAVA_COMPILER)
-$(JACKTEST_WITHJACK_JAR): $(JACKTEST_WITHJACK_SRC) $(BOOTCLASSPATH_LIBS) $(JACKTEST_LIB_JAR) $(PRIVATE_TEST_MK) $(jack_test_with_jack_sources_list) $(JACK_JAR)
- $(transform-host-java-to-package-with-jack)
+ifneq ($(strip $(JACKTEST_LIB_SRC)),)
+include $(CLEAR_VARS)
+LOCAL_MODULE := jacktest_$(JACKTEST_MODULE)_lib
+LOCAL_USE_JACK := true
+LOCAL_SRC_FILES := $(JACKTEST_LIB_SRC)
+LOCAL_MODULE_TAGS := optional
+LOCAL_JAVACFLAGS := -nowarn
+LOCAL_JAVA_LIBRARIES := junit4-hostdex-jack
+include $(BUILD_HOST_DALVIK_JAVA_LIBRARY)
+JACKTEST_LIB_DEX := $(LOCAL_BUILT_MODULE)
+JACK_TEST_LIB_NAME := $(LOCAL_MODULE)
+else
+JACKTEST_LIB_DEX :=
+JACK_TEST_LIB_NAME :=
+endif
-$(JACKTEST_LINK_DEX): PRIVATE_BOOTCLASSPATH := $(local_bootclasspath_jack)
-$(JACKTEST_LINK_DEX): PRIVATE_CLASSPATH :=
-$(JACKTEST_LINK_DEX): PRIVATE_JAVA_SOURCES := $(JACKTEST_LINK_SRC)
-$(JACKTEST_LINK_DEX): PRIVATE_ARGS := $(JACKTEST_ARGS) $(JACKTEST_SOURCE_JAVA7)
-$(JACKTEST_LINK_DEX): $(JACKTEST_LINK_SRC) $(PRIVATE_TEST_MK) $(BOOTCLASSPATH_LIBS) $(JACK_JAR)
- $(hide) mkdir -p $(dir $@)
- $(hide) $(JACK) $(PRIVATE_ARGS) $(PRIVATE_BOOTCLASSPATH) $(addprefix -cp ,$(PRIVATE_CLASSPATH)) -o $(dir $@) --ecj -nowarn \
- $(PRIVATE_JAVA_SOURCES)
+ifneq ($(strip $(JACKTEST_LINK_SRC)),)
+include $(CLEAR_VARS)
+LOCAL_MODULE := jacktest_$(JACKTEST_MODULE)_link
+LOCAL_USE_JACK := true
+LOCAL_SRC_FILES := $(JACKTEST_LINK_SRC)
+LOCAL_MODULE_TAGS := optional
+LOCAL_JAVACFLAGS := -nowarn
+LOCAL_JAVA_LIBRARIES := junit4-hostdex-jack
+include $(BUILD_HOST_DALVIK_JAVA_LIBRARY)
+JACKTEST_LINK_DEX := $(LOCAL_BUILT_MODULE)
+else
+JACKTEST_LINK_DEX :=
+endif
-$(JACKTEST_WITHJACK_DEX): PRIVATE_BOOTCLASSPATH := $(local_bootclasspath_jack)
-$(JACKTEST_WITHJACK_DEX): PRIVATE_CLASSPATH := $(call normalize-path-list,$(JACKTEST_LIB_JAR))
-$(JACKTEST_WITHJACK_DEX): PRIVATE_JAVA_SOURCES := $(JACKTEST_WITHJACK_SRC)
-$(JACKTEST_WITHJACK_DEX): PRIVATE_ARGS := $(JACKTEST_ARGS) $(JACKTEST_SOURCE_JAVA7)
-$(JACKTEST_WITHJACK_DEX): $(JACKTEST_WITHJACK_SRC) $(BOOTCLASSPATH_LIBS) $(PRIVATE_TEST_MK) $(JACKTEST_LIB_JAR) $(JACK_JAR)
- $(hide) mkdir -p $(dir $@)
- $(hide) $(JACK) $(PRIVATE_ARGS) -o $(dir $@) $(PRIVATE_BOOTCLASSPATH) $(addprefix -cp ,$(PRIVATE_CLASSPATH)) --ecj -nowarn \
- $(PRIVATE_JAVA_SOURCES)
+ifneq ($(strip $(JACKTEST_WITHJACK_SRC)),)
+include $(CLEAR_VARS)
+LOCAL_MODULE := jacktest_$(JACKTEST_MODULE)_withjack
+LOCAL_USE_JACK := true
+LOCAL_SRC_FILES := $(JACKTEST_WITHJACK_SRC)
+LOCAL_MODULE_TAGS := optional
+LOCAL_JAVACFLAGS := -nowarn
+LOCAL_JACK_FLAGS := $(JACKTEST_ARGS) $(JACKTEST_SOURCE_JAVA7)
+LOCAL_JAVA_LIBRARIES := junit4-hostdex-jack $(JACK_TEST_LIB_NAME)
+include $(BUILD_HOST_DALVIK_JAVA_LIBRARY)
+JACKTEST_WITHJACK_DEX := $(LOCAL_BUILT_MODULE)
+JACK_TEST_JACK_NAME := $(LOCAL_MODULE)
+else
+JACKTEST_WITHJACK_DEX :=
+JACK_TEST_JACK_NAME :=
+endif
-$(JACKTEST_WITHDX_JAR): PRIVATE_JACK_DEBUG_FLAGS := -g
-$(JACKTEST_WITHDX_JAR): PRIVATE_JAVA_SOURCES := $(JACKTEST_WITHDX_SRC)
-$(JACKTEST_WITHDX_JAR): PRIVATE_STATIC_JAVA_LIBRARIES :=
-$(JACKTEST_WITHDX_JAR): PRIVATE_ALL_JAVA_LIBRARIES := $(JACKTEST_LIB_JAR) $(JACKTEST_WITHJACK_JAR)
-$(JACKTEST_WITHDX_JAR): PRIVATE_SOURCE_INTERMEDIATES_DIR :=
-$(JACKTEST_WITHDX_JAR): PRIVATE_MODULE := jacktest_$(JACKTEST_MODULE)_withdx
-$(JACKTEST_WITHDX_JAR): PRIVATE_CLASS_INTERMEDIATES_DIR := $(JACKTEST_INTERMEDIATE_DIR)/withdx/classes
-$(JACKTEST_WITHDX_JAR): PRIVATE_BOOTCLASSPATH := $(local_bootclasspath)
-$(JACKTEST_WITHDX_JAR): PRIVATE_SOURCES_LIST := $(jack_test_with_dx_sources_list)
-$(JACKTEST_WITHDX_JAR): PRIVATE_JAVACFLAGS := -nowarn
-$(JACKTEST_WITHDX_JAR): $(JACKTEST_WITHDX_SRC) $(BOOTCLASSPATH_LIBS) $(JACKTEST_LIB_JAR) $(JACKTEST_WITHJACK_JAR) $(PRIVATE_TEST_MK) $(jack_test_with_dx_sources_list) $(JACK_JAR)
- $(transform-host-java-to-package-with-jack)
+ifneq ($(strip $(JACKTEST_WITHDX_SRC)),)
+include $(CLEAR_VARS)
+LOCAL_MODULE := jacktest_$(JACKTEST_MODULE)_withdx
+LOCAL_USE_JACK := false
+LOCAL_SRC_FILES := $(JACKTEST_WITHDX_SRC)
+LOCAL_MODULE_TAGS := optional
+LOCAL_JAVACFLAGS := -nowarn
+LOCAL_JAVA_LIBRARIES := junit4-hostdex-jack $(JACK_TEST_LIB_NAME) $(JACK_TEST_JACK_NAME)
+include $(BUILD_HOST_DALVIK_JAVA_LIBRARY)
+JACKTEST_WITHDX_DEX := $(LOCAL_BUILT_MODULE)
+else
+JACKTEST_WITHDX_DEX :=
+endif
-$(JACKTEST_WITHDX_DEX): PRIVATE_MODULE := jacktest_$(JACKTEST_MODULE)_withdx
-$(JACKTEST_WITHDX_DEX): PRIVATE_INTERMEDIATES_DIR := $(JACKTEST_INTERMEDIATE_DIR)/withdx
-$(JACKTEST_WITHDX_DEX): PRIVATE_DX_FLAGS :=
-$(JACKTEST_WITHDX_DEX): $(JACKTEST_WITHDX_JAR) | $(DX_ORIGIN)
- $(transform-classes.jar-to-dex-with-dx-origin)
# Make sure that this JACKTEST_MODULE is unique.
jackmodule_id := JACKMODULE.$(JACKTEST_MODULE)
@@ -145,14 +101,12 @@ test-jack-$(JACKTEST_MODULE): PRIVATE_CLASSPATH := $(JACKTEST_WITHDX_DEX) $(JACK
test-jack-$(JACKTEST_MODULE): PRIVATE_JUNIT := $(JACKTEST_JUNIT)
test-jack-$(JACKTEST_MODULE): PRIVATE_DALVIK_FLAGS := $(JACKTEST_DALVIK_FLAGS)
test-jack-$(JACKTEST_MODULE): PRIVATE_MODULE := $(JACKTEST_MODULE)
-test-jack-$(JACKTEST_MODULE): $(JACKTEST_WITHDX_DEX) $(JACKTEST_WITHJACK_DEX) $(JACKTEST_LIB_DEX) $(JACKTEST_LINK_DEX) $(BOOTCLASSPATH_DEX) | $(junit.dex)
+test-jack-$(JACKTEST_MODULE): $(JACKTEST_WITHDX_DEX) $(JACKTEST_WITHJACK_DEX) $(JACKTEST_LIB_DEX) $(JACKTEST_LINK_DEX) $(BOOTCLASSPATH_DEX) | $(junit.dex) $(HOST_OUT_EXECUTABLES)/art
$(hide) mkdir -p /tmp/android-data/dalvik-cache
$(hide) find /tmp/android-data/ -name "*$(subst /,@,$(PRIVATE_MODULE))*.dex" | xargs rm -f
ifneq ($(ART_ANDROID_BUILD_TOP),)
ANDROID_BUILD_TOP=$(ART_ANDROID_BUILD_TOP) ANDROID_HOST_OUT=$(ART_ANDROID_BUILD_TOP)/out/host/linux-x86 $(ART_ANDROID_BUILD_TOP)/out/host/linux-x86/bin/art $(PRIVATE_DALVIK_FLAGS) -classpath $(call normalize-path-list,$(PRIVATE_CLASSPATH)) org.junit.runner.JUnitCore $(PRIVATE_JUNIT) && echo $@ PASSED || (echo $@ FAILED with ART; exit 42)
else
- $(hide) dalvik $(PRIVATE_DALVIK_FLAGS) -Xint:fast -classpath $(call normalize-path-list,$(PRIVATE_CLASSPATH)) org.junit.runner.JUnitCore $(PRIVATE_JUNIT) \
- || (echo $@ FAILED with fast interpreter; exit 42)
- $(hide) dalvik $(PRIVATE_DALVIK_FLAGS) -classpath $(call normalize-path-list,$(PRIVATE_CLASSPATH)) org.junit.runner.JUnitCore $(PRIVATE_JUNIT) \
- && echo $@ PASSED || (echo $@ FAILED with JIT; exit 42)
+ $(hide) art $(PRIVATE_DALVIK_FLAGS) -classpath $(call normalize-path-list,$(PRIVATE_CLASSPATH)) org.junit.runner.JUnitCore $(PRIVATE_JUNIT) \
+ || (echo $@ FAILED; exit 42)
endif
diff --git a/jack-tests/build/test.mk b/jack-tests/build/test.mk
index 8c14001c..0474f130 100644
--- a/jack-tests/build/test.mk
+++ b/jack-tests/build/test.mk
@@ -12,27 +12,25 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-private_path:= $(call my-dir)
+LOCAL_PATH := $(JACK_PATH)
-JACKTEST_WITHJACK_SRC := $(call all-java-files-under, $(abspath $(JACKTEST_MODULE_PATH)/jack/))
-JACKTEST_WITHJACK_FOLDER := $(abspath $(JACKTEST_MODULE_PATH)/jack/)
-ifneq ($(wildcard $(JACKTEST_WITHJACK_FOLDER)),)
+JACKTEST_WITHJACK_FOLDER := $(JACKTEST_MODULE_PATH)/jack/
+ifneq ($(wildcard $(LOCAL_PATH)/$(JACKTEST_WITHJACK_FOLDER)*),)
JACKTEST_WITHJACK_SRC := $(call all-java-files-under, $(JACKTEST_WITHJACK_FOLDER))
endif
-JACKTEST_LINK_FOLDER := $(abspath $(JACKTEST_MODULE_PATH)/link/)
-ifneq ($(wildcard $(JACKTEST_LINK_FOLDER)),)
+JACKTEST_LINK_FOLDER := $(JACKTEST_MODULE_PATH)/link/
+ifneq ($(wildcard $(LOCAL_PATH)/$(JACKTEST_LINK_FOLDER)),)
JACKTEST_LINK_SRC := $(call all-java-files-under, $(JACKTEST_LINK_FOLDER))
endif
-JACKTEST_WITHDX_SRC := $(call all-java-files-under, $(abspath $(JACKTEST_MODULE_PATH)/dx/))
-JACKTEST_WITHDX_FOLDER := $(abspath $(JACKTEST_MODULE_PATH)/dx/)
-ifneq ($(wildcard $(JACKTEST_WITHDX_FOLDER)),)
+JACKTEST_WITHDX_FOLDER := $(JACKTEST_MODULE_PATH)/dx/
+ifneq ($(wildcard $(LOCAL_PATH)/$(JACKTEST_WITHDX_FOLDER)),)
JACKTEST_WITHDX_SRC := $(call all-java-files-under, $(JACKTEST_WITHDX_FOLDER))
endif
-JACKTEST_LIB_FOLDER := $(abspath $(JACKTEST_MODULE_PATH)/lib/)
-ifneq ($(wildcard $(JACKTEST_LIB_FOLDER)),)
+JACKTEST_LIB_FOLDER := $(JACKTEST_MODULE_PATH)/lib/
+ifneq ($(wildcard $(LOCAL_PATH)/$(JACKTEST_LIB_FOLDER)),)
JACKTEST_LIB_SRC := $(call all-java-files-under, $(JACKTEST_LIB_FOLDER))
endif
JACKTEST_JUNIT := com.android.jack.$(subst /,.,$(JACKTEST_MODULE)).dx.Tests
diff --git a/jack-tests/tests/com/android/jack/debug/test001/test.mk b/jack-tests/tests/com/android/jack/debug/test001/test.mk
index 45748cd7..bd4821d8 100644
--- a/jack-tests/tests/com/android/jack/debug/test001/test.mk
+++ b/jack-tests/tests/com/android/jack/debug/test001/test.mk
@@ -12,14 +12,14 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-private_path:= $(call my-dir)
+LOCAL_PATH:= $(call my-dir)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := debug/test001
JACKTEST_ARGS := -g
-JACKTEST_WITHJACK_SRC := $(call all-java-files-under, $(abspath $(private_path)/jack/))
-JACKTEST_WITHDX_SRC := $(call all-java-files-under, $(abspath $(private_path)/dx/))
+JACKTEST_WITHJACK_SRC := $(call all-java-files-under, jack)
+JACKTEST_WITHDX_SRC := $(call all-java-files-under, dx)
JACKTEST_JUNIT := com.android.jack.$(subst /,.,$(JACKTEST_MODULE)).dx.Tests
include $(JACK_RUN_TEST)
diff --git a/jack-tests/tests/com/android/jack/enums/test003/test.mk b/jack-tests/tests/com/android/jack/enums/test003/test.mk
index 04e7a919..ad60a60d 100644
--- a/jack-tests/tests/com/android/jack/enums/test003/test.mk
+++ b/jack-tests/tests/com/android/jack/enums/test003/test.mk
@@ -12,14 +12,14 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-private_path:= $(call my-dir)
+LOCAL_PATH:= $(call my-dir)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := enums/test003
-JACKTEST_WITHJACK_SRC := $(call all-java-files-under, $(abspath $(private_path)/jack/))
-JACKTEST_WITHDX_SRC := $(call all-java-files-under, $(abspath $(private_path)/dx/))
-JACKTEST_LINK_SRC := $(call all-java-files-under, $(abspath $(private_path)/link/))
+JACKTEST_WITHJACK_SRC := $(call all-java-files-under, jack)
+JACKTEST_WITHDX_SRC := $(call all-java-files-under, dx)
+JACKTEST_LINK_SRC := $(call all-java-files-under, link)
JACKTEST_JUNIT := com.android.jack.$(subst /,.,$(JACKTEST_MODULE)).dx.Tests
JACKTEST_DALVIK_FLAGS := -Xdexopt:none -Xverify:none
diff --git a/jack-tests/tests/com/android/jack/jarjar/test001/test.mk b/jack-tests/tests/com/android/jack/jarjar/test001/test.mk
index 906960e6..9ad826e8 100644
--- a/jack-tests/tests/com/android/jack/jarjar/test001/test.mk
+++ b/jack-tests/tests/com/android/jack/jarjar/test001/test.mk
@@ -12,14 +12,14 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-private_path:= $(call my-dir)
+LOCAL_PATH:= $(call my-dir)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := jarjar/test001
-JACKTEST_ARGS := --jarjar-rules $(private_path)/jarjar-rules.txt
-JACKTEST_WITHJACK_SRC := $(call all-java-files-under, $(abspath $(private_path)/jack/))
-JACKTEST_WITHDX_SRC := $(call all-java-files-under, $(abspath $(private_path)/dx/))
+JACKTEST_ARGS := --jarjar-rules $(LOCAL_PATH)/jarjar-rules.txt
+JACKTEST_WITHJACK_SRC := $(call all-java-files-under, jack)
+JACKTEST_WITHDX_SRC := $(call all-java-files-under, dx)
JACKTEST_JUNIT := com.android.jack.$(subst /,.,$(JACKTEST_MODULE)).dx.Tests
include $(JACK_RUN_TEST)
diff --git a/jack-tests/tests/com/android/jack/jarjar/test003/test.mk b/jack-tests/tests/com/android/jack/jarjar/test003/test.mk
index 756cea37..dca86093 100644
--- a/jack-tests/tests/com/android/jack/jarjar/test003/test.mk
+++ b/jack-tests/tests/com/android/jack/jarjar/test003/test.mk
@@ -12,14 +12,14 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-private_path:= $(call my-dir)
+LOCAL_PATH:= $(call my-dir)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := jarjar/test003
-JACKTEST_ARGS := --jarjar-rules $(private_path)/jarjar-rules.txt
-JACKTEST_WITHJACK_SRC := $(call all-java-files-under, $(abspath $(private_path)/jack/))
-JACKTEST_WITHDX_SRC := $(call all-java-files-under, $(abspath $(private_path)/dx/))
+JACKTEST_ARGS := --jarjar-rules $(LOCAL_PATH)/jarjar-rules.txt
+JACKTEST_WITHJACK_SRC := $(call all-java-files-under, jack)
+JACKTEST_WITHDX_SRC := $(call all-java-files-under, dx)
JACKTEST_JUNIT := com.android.jack.$(subst /,.,$(JACKTEST_MODULE)).dx.Tests
include $(JACK_RUN_TEST)
diff --git a/jack-tests/tests/com/android/jack/opcodes/test-opcodes.mk b/jack-tests/tests/com/android/jack/opcodes/test-opcodes.mk
index 3d8d47ff..9b916ffd 100644
--- a/jack-tests/tests/com/android/jack/opcodes/test-opcodes.mk
+++ b/jack-tests/tests/com/android/jack/opcodes/test-opcodes.mk
@@ -17,8 +17,8 @@
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := opcode-add_double
-JACKTEST_WITHDX_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/add_double/Test_add_double.java $(JACK_PATH)/src/com/android/jack/DxTestCase.java
-JACKTEST_WITHJACK_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/add_double/jm/T_add_double_1.java $(JACK_PATH)/tests/com/android/jack/opcodes/add_double/jm/T_add_double_3.java $(JACK_PATH)/tests/com/android/jack/opcodes/add_double/jm/T_add_double_4.java
+JACKTEST_WITHDX_SRC := tests/com/android/jack/opcodes/add_double/Test_add_double.java src/com/android/jack/DxTestCase.java
+JACKTEST_WITHJACK_SRC := tests/com/android/jack/opcodes/add_double/jm/T_add_double_1.java tests/com/android/jack/opcodes/add_double/jm/T_add_double_3.java tests/com/android/jack/opcodes/add_double/jm/T_add_double_4.java
JACKTEST_JUNIT := com.android.jack.opcodes.add_double.Test_add_double
include $(JACK_RUN_TEST)
@@ -28,8 +28,8 @@ include $(JACK_RUN_TEST)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := opcode-float_to_long
-JACKTEST_WITHDX_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/float_to_long/Test_float_to_long.java $(JACK_PATH)/src/com/android/jack/DxTestCase.java
-JACKTEST_WITHJACK_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/float_to_long/jm/T_float_to_long_1.java $(JACK_PATH)/tests/com/android/jack/opcodes/float_to_long/jm/T_float_to_long_3.java $(JACK_PATH)/tests/com/android/jack/opcodes/float_to_long/jm/T_float_to_long_4.java
+JACKTEST_WITHDX_SRC := tests/com/android/jack/opcodes/float_to_long/Test_float_to_long.java src/com/android/jack/DxTestCase.java
+JACKTEST_WITHJACK_SRC := tests/com/android/jack/opcodes/float_to_long/jm/T_float_to_long_1.java tests/com/android/jack/opcodes/float_to_long/jm/T_float_to_long_3.java tests/com/android/jack/opcodes/float_to_long/jm/T_float_to_long_4.java
JACKTEST_JUNIT := com.android.jack.opcodes.float_to_long.Test_float_to_long
include $(JACK_RUN_TEST)
@@ -39,8 +39,8 @@ include $(JACK_RUN_TEST)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := opcode-array_length
-JACKTEST_WITHDX_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/array_length/Test_array_length.java $(JACK_PATH)/src/com/android/jack/DxTestCase.java
-JACKTEST_WITHJACK_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/array_length/jm/T_array_length_1.java $(JACK_PATH)/tests/com/android/jack/opcodes/array_length/jm/T_array_length_2.java
+JACKTEST_WITHDX_SRC := tests/com/android/jack/opcodes/array_length/Test_array_length.java src/com/android/jack/DxTestCase.java
+JACKTEST_WITHJACK_SRC := tests/com/android/jack/opcodes/array_length/jm/T_array_length_1.java tests/com/android/jack/opcodes/array_length/jm/T_array_length_2.java
JACKTEST_JUNIT := com.android.jack.opcodes.array_length.Test_array_length
include $(JACK_RUN_TEST)
@@ -50,8 +50,8 @@ include $(JACK_RUN_TEST)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := opcode-sub_double
-JACKTEST_WITHDX_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/sub_double/Test_sub_double.java $(JACK_PATH)/src/com/android/jack/DxTestCase.java
-JACKTEST_WITHJACK_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/sub_double/jm/T_sub_double_1.java $(JACK_PATH)/tests/com/android/jack/opcodes/sub_double/jm/T_sub_double_3.java $(JACK_PATH)/tests/com/android/jack/opcodes/sub_double/jm/T_sub_double_4.java
+JACKTEST_WITHDX_SRC := tests/com/android/jack/opcodes/sub_double/Test_sub_double.java src/com/android/jack/DxTestCase.java
+JACKTEST_WITHJACK_SRC := tests/com/android/jack/opcodes/sub_double/jm/T_sub_double_1.java tests/com/android/jack/opcodes/sub_double/jm/T_sub_double_3.java tests/com/android/jack/opcodes/sub_double/jm/T_sub_double_4.java
JACKTEST_JUNIT := com.android.jack.opcodes.sub_double.Test_sub_double
include $(JACK_RUN_TEST)
@@ -61,8 +61,8 @@ include $(JACK_RUN_TEST)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := opcode-int_to_short
-JACKTEST_WITHDX_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/int_to_short/Test_int_to_short.java $(JACK_PATH)/src/com/android/jack/DxTestCase.java
-JACKTEST_WITHJACK_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/int_to_short/jm/T_int_to_short_1.java $(JACK_PATH)/tests/com/android/jack/opcodes/int_to_short/jm/T_int_to_short_3.java $(JACK_PATH)/tests/com/android/jack/opcodes/int_to_short/jm/T_int_to_short_4.java
+JACKTEST_WITHDX_SRC := tests/com/android/jack/opcodes/int_to_short/Test_int_to_short.java src/com/android/jack/DxTestCase.java
+JACKTEST_WITHJACK_SRC := tests/com/android/jack/opcodes/int_to_short/jm/T_int_to_short_1.java tests/com/android/jack/opcodes/int_to_short/jm/T_int_to_short_3.java tests/com/android/jack/opcodes/int_to_short/jm/T_int_to_short_4.java
JACKTEST_JUNIT := com.android.jack.opcodes.int_to_short.Test_int_to_short
include $(JACK_RUN_TEST)
@@ -72,8 +72,8 @@ include $(JACK_RUN_TEST)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := opcode-int_to_long
-JACKTEST_WITHDX_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/int_to_long/Test_int_to_long.java $(JACK_PATH)/src/com/android/jack/DxTestCase.java
-JACKTEST_WITHJACK_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/int_to_long/jm/T_int_to_long_1.java $(JACK_PATH)/tests/com/android/jack/opcodes/int_to_long/jm/T_int_to_long_3.java $(JACK_PATH)/tests/com/android/jack/opcodes/int_to_long/jm/T_int_to_long_4.java
+JACKTEST_WITHDX_SRC := tests/com/android/jack/opcodes/int_to_long/Test_int_to_long.java src/com/android/jack/DxTestCase.java
+JACKTEST_WITHJACK_SRC := tests/com/android/jack/opcodes/int_to_long/jm/T_int_to_long_1.java tests/com/android/jack/opcodes/int_to_long/jm/T_int_to_long_3.java tests/com/android/jack/opcodes/int_to_long/jm/T_int_to_long_4.java
JACKTEST_JUNIT := com.android.jack.opcodes.int_to_long.Test_int_to_long
include $(JACK_RUN_TEST)
@@ -83,8 +83,8 @@ include $(JACK_RUN_TEST)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := opcode-aput
-JACKTEST_WITHDX_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/aput/Test_aput.java $(JACK_PATH)/src/com/android/jack/DxTestCase.java
-JACKTEST_WITHJACK_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/aput/jm/T_aput_1.java $(JACK_PATH)/tests/com/android/jack/opcodes/aput/jm/T_aput_2.java $(JACK_PATH)/tests/com/android/jack/opcodes/aput/jm/T_aput_3.java $(JACK_PATH)/tests/com/android/jack/opcodes/aput/jm/T_aput_4.java $(JACK_PATH)/tests/com/android/jack/opcodes/aput/jm/T_aput_5.java $(JACK_PATH)/tests/com/android/jack/opcodes/aput/jm/T_aput_6.java
+JACKTEST_WITHDX_SRC := tests/com/android/jack/opcodes/aput/Test_aput.java src/com/android/jack/DxTestCase.java
+JACKTEST_WITHJACK_SRC := tests/com/android/jack/opcodes/aput/jm/T_aput_1.java tests/com/android/jack/opcodes/aput/jm/T_aput_2.java tests/com/android/jack/opcodes/aput/jm/T_aput_3.java tests/com/android/jack/opcodes/aput/jm/T_aput_4.java tests/com/android/jack/opcodes/aput/jm/T_aput_5.java tests/com/android/jack/opcodes/aput/jm/T_aput_6.java
JACKTEST_JUNIT := com.android.jack.opcodes.aput.Test_aput
include $(JACK_RUN_TEST)
@@ -94,8 +94,8 @@ include $(JACK_RUN_TEST)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := opcode-if_gez
-JACKTEST_WITHDX_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/if_gez/Test_if_gez.java $(JACK_PATH)/src/com/android/jack/DxTestCase.java
-JACKTEST_WITHJACK_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/if_gez/jm/T_if_gez_1.java $(JACK_PATH)/tests/com/android/jack/opcodes/if_gez/jm/T_if_gez_2.java
+JACKTEST_WITHDX_SRC := tests/com/android/jack/opcodes/if_gez/Test_if_gez.java src/com/android/jack/DxTestCase.java
+JACKTEST_WITHJACK_SRC := tests/com/android/jack/opcodes/if_gez/jm/T_if_gez_1.java tests/com/android/jack/opcodes/if_gez/jm/T_if_gez_2.java
JACKTEST_JUNIT := com.android.jack.opcodes.if_gez.Test_if_gez
include $(JACK_RUN_TEST)
@@ -105,8 +105,8 @@ include $(JACK_RUN_TEST)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := opcode-check_cast
-JACKTEST_WITHDX_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/check_cast/Test_check_cast.java $(JACK_PATH)/src/com/android/jack/DxTestCase.java
-JACKTEST_WITHJACK_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/check_cast/jm/T_check_cast_1.java
+JACKTEST_WITHDX_SRC := tests/com/android/jack/opcodes/check_cast/Test_check_cast.java src/com/android/jack/DxTestCase.java
+JACKTEST_WITHJACK_SRC := tests/com/android/jack/opcodes/check_cast/jm/T_check_cast_1.java
JACKTEST_JUNIT := com.android.jack.opcodes.check_cast.Test_check_cast
include $(JACK_RUN_TEST)
@@ -116,8 +116,8 @@ include $(JACK_RUN_TEST)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := opcode-cmpl_double
-JACKTEST_WITHDX_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/cmpl_double/Test_cmpl_double.java $(JACK_PATH)/src/com/android/jack/DxTestCase.java
-JACKTEST_WITHJACK_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/cmpl_double/jm/T_cmpl_double_1.java
+JACKTEST_WITHDX_SRC := tests/com/android/jack/opcodes/cmpl_double/Test_cmpl_double.java src/com/android/jack/DxTestCase.java
+JACKTEST_WITHJACK_SRC := tests/com/android/jack/opcodes/cmpl_double/jm/T_cmpl_double_1.java
JACKTEST_JUNIT := com.android.jack.opcodes.cmpl_double.Test_cmpl_double
include $(JACK_RUN_TEST)
@@ -127,8 +127,8 @@ include $(JACK_RUN_TEST)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := opcode-double_to_int
-JACKTEST_WITHDX_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/double_to_int/Test_double_to_int.java $(JACK_PATH)/src/com/android/jack/DxTestCase.java
-JACKTEST_WITHJACK_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/double_to_int/jm/T_double_to_int_1.java $(JACK_PATH)/tests/com/android/jack/opcodes/double_to_int/jm/T_double_to_int_3.java $(JACK_PATH)/tests/com/android/jack/opcodes/double_to_int/jm/T_double_to_int_4.java
+JACKTEST_WITHDX_SRC := tests/com/android/jack/opcodes/double_to_int/Test_double_to_int.java src/com/android/jack/DxTestCase.java
+JACKTEST_WITHJACK_SRC := tests/com/android/jack/opcodes/double_to_int/jm/T_double_to_int_1.java tests/com/android/jack/opcodes/double_to_int/jm/T_double_to_int_3.java tests/com/android/jack/opcodes/double_to_int/jm/T_double_to_int_4.java
JACKTEST_JUNIT := com.android.jack.opcodes.double_to_int.Test_double_to_int
include $(JACK_RUN_TEST)
@@ -138,8 +138,8 @@ include $(JACK_RUN_TEST)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := opcode-int_to_byte
-JACKTEST_WITHDX_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/int_to_byte/Test_int_to_byte.java $(JACK_PATH)/src/com/android/jack/DxTestCase.java
-JACKTEST_WITHJACK_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/int_to_byte/jm/T_int_to_byte_1.java $(JACK_PATH)/tests/com/android/jack/opcodes/int_to_byte/jm/T_int_to_byte_3.java $(JACK_PATH)/tests/com/android/jack/opcodes/int_to_byte/jm/T_int_to_byte_4.java
+JACKTEST_WITHDX_SRC := tests/com/android/jack/opcodes/int_to_byte/Test_int_to_byte.java src/com/android/jack/DxTestCase.java
+JACKTEST_WITHJACK_SRC := tests/com/android/jack/opcodes/int_to_byte/jm/T_int_to_byte_1.java tests/com/android/jack/opcodes/int_to_byte/jm/T_int_to_byte_3.java tests/com/android/jack/opcodes/int_to_byte/jm/T_int_to_byte_4.java
JACKTEST_JUNIT := com.android.jack.opcodes.int_to_byte.Test_int_to_byte
include $(JACK_RUN_TEST)
@@ -149,8 +149,8 @@ include $(JACK_RUN_TEST)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := opcode-shl_int
-JACKTEST_WITHDX_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/shl_int/Test_shl_int.java $(JACK_PATH)/src/com/android/jack/DxTestCase.java
-JACKTEST_WITHJACK_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/shl_int/jm/T_shl_int_1.java $(JACK_PATH)/tests/com/android/jack/opcodes/shl_int/jm/T_shl_int_3.java $(JACK_PATH)/tests/com/android/jack/opcodes/shl_int/jm/T_shl_int_4.java
+JACKTEST_WITHDX_SRC := tests/com/android/jack/opcodes/shl_int/Test_shl_int.java src/com/android/jack/DxTestCase.java
+JACKTEST_WITHJACK_SRC := tests/com/android/jack/opcodes/shl_int/jm/T_shl_int_1.java tests/com/android/jack/opcodes/shl_int/jm/T_shl_int_3.java tests/com/android/jack/opcodes/shl_int/jm/T_shl_int_4.java
JACKTEST_JUNIT := com.android.jack.opcodes.shl_int.Test_shl_int
include $(JACK_RUN_TEST)
@@ -160,8 +160,8 @@ include $(JACK_RUN_TEST)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := opcode-long_to_double
-JACKTEST_WITHDX_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/long_to_double/Test_long_to_double.java $(JACK_PATH)/src/com/android/jack/DxTestCase.java
-JACKTEST_WITHJACK_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/long_to_double/jm/T_long_to_double_1.java $(JACK_PATH)/tests/com/android/jack/opcodes/long_to_double/jm/T_long_to_double_3.java $(JACK_PATH)/tests/com/android/jack/opcodes/long_to_double/jm/T_long_to_double_4.java
+JACKTEST_WITHDX_SRC := tests/com/android/jack/opcodes/long_to_double/Test_long_to_double.java src/com/android/jack/DxTestCase.java
+JACKTEST_WITHJACK_SRC := tests/com/android/jack/opcodes/long_to_double/jm/T_long_to_double_1.java tests/com/android/jack/opcodes/long_to_double/jm/T_long_to_double_3.java tests/com/android/jack/opcodes/long_to_double/jm/T_long_to_double_4.java
JACKTEST_JUNIT := com.android.jack.opcodes.long_to_double.Test_long_to_double
include $(JACK_RUN_TEST)
@@ -171,8 +171,8 @@ include $(JACK_RUN_TEST)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := opcode-if_ge
-JACKTEST_WITHDX_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/if_ge/Test_if_ge.java $(JACK_PATH)/src/com/android/jack/DxTestCase.java
-JACKTEST_WITHJACK_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/if_ge/jm/T_if_ge_1.java $(JACK_PATH)/tests/com/android/jack/opcodes/if_ge/jm/T_if_ge_2.java
+JACKTEST_WITHDX_SRC := tests/com/android/jack/opcodes/if_ge/Test_if_ge.java src/com/android/jack/DxTestCase.java
+JACKTEST_WITHJACK_SRC := tests/com/android/jack/opcodes/if_ge/jm/T_if_ge_1.java tests/com/android/jack/opcodes/if_ge/jm/T_if_ge_2.java
JACKTEST_JUNIT := com.android.jack.opcodes.if_ge.Test_if_ge
include $(JACK_RUN_TEST)
@@ -182,8 +182,8 @@ include $(JACK_RUN_TEST)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := opcode-opc_new
-JACKTEST_WITHDX_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/opc_new/Test_opc_new.java $(JACK_PATH)/src/com/android/jack/DxTestCase.java
-JACKTEST_WITHJACK_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/opc_new/jm/TestStubs.java $(JACK_PATH)/tests/com/android/jack/opcodes/opc_new/jm/T_opc_new_1.java $(JACK_PATH)/tests/com/android/jack/opcodes/opc_new/jm/T_opc_new_3.java $(JACK_PATH)/tests/com/android/jack/opcodes/opc_new/jm/T_opc_new_9.java
+JACKTEST_WITHDX_SRC := tests/com/android/jack/opcodes/opc_new/Test_opc_new.java src/com/android/jack/DxTestCase.java
+JACKTEST_WITHJACK_SRC := tests/com/android/jack/opcodes/opc_new/jm/TestStubs.java tests/com/android/jack/opcodes/opc_new/jm/T_opc_new_1.java tests/com/android/jack/opcodes/opc_new/jm/T_opc_new_3.java tests/com/android/jack/opcodes/opc_new/jm/T_opc_new_9.java
JACKTEST_JUNIT := com.android.jack.opcodes.opc_new.Test_opc_new
include $(JACK_RUN_TEST)
@@ -193,8 +193,8 @@ include $(JACK_RUN_TEST)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := opcode-add_float
-JACKTEST_WITHDX_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/add_float/Test_add_float.java $(JACK_PATH)/src/com/android/jack/DxTestCase.java
-JACKTEST_WITHJACK_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/add_float/jm/T_add_float_1.java $(JACK_PATH)/tests/com/android/jack/opcodes/add_float/jm/T_add_float_3.java $(JACK_PATH)/tests/com/android/jack/opcodes/add_float/jm/T_add_float_4.java
+JACKTEST_WITHDX_SRC := tests/com/android/jack/opcodes/add_float/Test_add_float.java src/com/android/jack/DxTestCase.java
+JACKTEST_WITHJACK_SRC := tests/com/android/jack/opcodes/add_float/jm/T_add_float_1.java tests/com/android/jack/opcodes/add_float/jm/T_add_float_3.java tests/com/android/jack/opcodes/add_float/jm/T_add_float_4.java
JACKTEST_JUNIT := com.android.jack.opcodes.add_float.Test_add_float
include $(JACK_RUN_TEST)
@@ -204,8 +204,8 @@ include $(JACK_RUN_TEST)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := opcode-cmp_long
-JACKTEST_WITHDX_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/cmp_long/Test_cmp_long.java $(JACK_PATH)/src/com/android/jack/DxTestCase.java
-JACKTEST_WITHJACK_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/cmp_long/jm/T_cmp_long_1.java $(JACK_PATH)/tests/com/android/jack/opcodes/cmp_long/jm/T_cmp_long_3.java $(JACK_PATH)/tests/com/android/jack/opcodes/cmp_long/jm/T_cmp_long_4.java $(JACK_PATH)/tests/com/android/jack/opcodes/cmp_long/jm/T_cmp_long_5.java
+JACKTEST_WITHDX_SRC := tests/com/android/jack/opcodes/cmp_long/Test_cmp_long.java src/com/android/jack/DxTestCase.java
+JACKTEST_WITHJACK_SRC := tests/com/android/jack/opcodes/cmp_long/jm/T_cmp_long_1.java tests/com/android/jack/opcodes/cmp_long/jm/T_cmp_long_3.java tests/com/android/jack/opcodes/cmp_long/jm/T_cmp_long_4.java tests/com/android/jack/opcodes/cmp_long/jm/T_cmp_long_5.java
JACKTEST_JUNIT := com.android.jack.opcodes.cmp_long.Test_cmp_long
include $(JACK_RUN_TEST)
@@ -215,8 +215,8 @@ include $(JACK_RUN_TEST)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := opcode-opc_instanceof
-JACKTEST_WITHDX_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/opc_instanceof/Test_opc_instanceof.java $(JACK_PATH)/src/com/android/jack/DxTestCase.java
-JACKTEST_WITHJACK_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/opc_instanceof/jm/TestStubs.java $(JACK_PATH)/tests/com/android/jack/opcodes/opc_instanceof/jm/T_opc_instanceof_1.java
+JACKTEST_WITHDX_SRC := tests/com/android/jack/opcodes/opc_instanceof/Test_opc_instanceof.java src/com/android/jack/DxTestCase.java
+JACKTEST_WITHJACK_SRC := tests/com/android/jack/opcodes/opc_instanceof/jm/TestStubs.java tests/com/android/jack/opcodes/opc_instanceof/jm/T_opc_instanceof_1.java
JACKTEST_JUNIT := com.android.jack.opcodes.opc_instanceof.Test_opc_instanceof
include $(JACK_RUN_TEST)
@@ -226,8 +226,8 @@ include $(JACK_RUN_TEST)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := opcode-int_to_char
-JACKTEST_WITHDX_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/int_to_char/Test_int_to_char.java $(JACK_PATH)/src/com/android/jack/DxTestCase.java
-JACKTEST_WITHJACK_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/int_to_char/jm/T_int_to_char_1.java $(JACK_PATH)/tests/com/android/jack/opcodes/int_to_char/jm/T_int_to_char_3.java $(JACK_PATH)/tests/com/android/jack/opcodes/int_to_char/jm/T_int_to_char_4.java
+JACKTEST_WITHDX_SRC := tests/com/android/jack/opcodes/int_to_char/Test_int_to_char.java src/com/android/jack/DxTestCase.java
+JACKTEST_WITHJACK_SRC := tests/com/android/jack/opcodes/int_to_char/jm/T_int_to_char_1.java tests/com/android/jack/opcodes/int_to_char/jm/T_int_to_char_3.java tests/com/android/jack/opcodes/int_to_char/jm/T_int_to_char_4.java
JACKTEST_JUNIT := com.android.jack.opcodes.int_to_char.Test_int_to_char
include $(JACK_RUN_TEST)
@@ -237,8 +237,8 @@ include $(JACK_RUN_TEST)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := opcode-aget_short
-JACKTEST_WITHDX_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/aget_short/Test_aget_short.java $(JACK_PATH)/src/com/android/jack/DxTestCase.java
-JACKTEST_WITHJACK_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/aget_short/jm/T_aget_short_1.java $(JACK_PATH)/tests/com/android/jack/opcodes/aget_short/jm/T_aget_short_4.java $(JACK_PATH)/tests/com/android/jack/opcodes/aget_short/jm/T_aget_short_5.java
+JACKTEST_WITHDX_SRC := tests/com/android/jack/opcodes/aget_short/Test_aget_short.java src/com/android/jack/DxTestCase.java
+JACKTEST_WITHJACK_SRC := tests/com/android/jack/opcodes/aget_short/jm/T_aget_short_1.java tests/com/android/jack/opcodes/aget_short/jm/T_aget_short_4.java tests/com/android/jack/opcodes/aget_short/jm/T_aget_short_5.java
JACKTEST_JUNIT := com.android.jack.opcodes.aget_short.Test_aget_short
include $(JACK_RUN_TEST)
@@ -248,8 +248,8 @@ include $(JACK_RUN_TEST)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := opcode-and_int
-JACKTEST_WITHDX_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/and_int/Test_and_int.java $(JACK_PATH)/src/com/android/jack/DxTestCase.java
-JACKTEST_WITHJACK_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/and_int/jm/T_and_int_1.java $(JACK_PATH)/tests/com/android/jack/opcodes/and_int/jm/T_and_int_3.java $(JACK_PATH)/tests/com/android/jack/opcodes/and_int/jm/T_and_int_4.java
+JACKTEST_WITHDX_SRC := tests/com/android/jack/opcodes/and_int/Test_and_int.java src/com/android/jack/DxTestCase.java
+JACKTEST_WITHJACK_SRC := tests/com/android/jack/opcodes/and_int/jm/T_and_int_1.java tests/com/android/jack/opcodes/and_int/jm/T_and_int_3.java tests/com/android/jack/opcodes/and_int/jm/T_and_int_4.java
JACKTEST_JUNIT := com.android.jack.opcodes.and_int.Test_and_int
include $(JACK_RUN_TEST)
@@ -259,8 +259,8 @@ include $(JACK_RUN_TEST)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := opcode-if_eqz
-JACKTEST_WITHDX_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/if_eqz/Test_if_eqz.java $(JACK_PATH)/src/com/android/jack/DxTestCase.java
-JACKTEST_WITHJACK_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/if_eqz/jm/T_if_eqz_1.java $(JACK_PATH)/tests/com/android/jack/opcodes/if_eqz/jm/T_if_eqz_2.java $(JACK_PATH)/tests/com/android/jack/opcodes/if_eqz/jm/T_if_eqz_3.java $(JACK_PATH)/tests/com/android/jack/opcodes/if_eqz/jm/T_if_eqz_4.java
+JACKTEST_WITHDX_SRC := tests/com/android/jack/opcodes/if_eqz/Test_if_eqz.java src/com/android/jack/DxTestCase.java
+JACKTEST_WITHJACK_SRC := tests/com/android/jack/opcodes/if_eqz/jm/T_if_eqz_1.java tests/com/android/jack/opcodes/if_eqz/jm/T_if_eqz_2.java tests/com/android/jack/opcodes/if_eqz/jm/T_if_eqz_3.java tests/com/android/jack/opcodes/if_eqz/jm/T_if_eqz_4.java
JACKTEST_JUNIT := com.android.jack.opcodes.if_eqz.Test_if_eqz
include $(JACK_RUN_TEST)
@@ -270,8 +270,8 @@ include $(JACK_RUN_TEST)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := opcode-opc_goto
-JACKTEST_WITHDX_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/opc_goto/Test_opc_goto.java $(JACK_PATH)/src/com/android/jack/DxTestCase.java
-JACKTEST_WITHJACK_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/opc_goto/jm/T_opc_goto_1.java $(JACK_PATH)/tests/com/android/jack/opcodes/opc_goto/jm/T_opc_goto_2.java $(JACK_PATH)/tests/com/android/jack/opcodes/opc_goto/jm/T_opc_goto_5.java
+JACKTEST_WITHDX_SRC := tests/com/android/jack/opcodes/opc_goto/Test_opc_goto.java src/com/android/jack/DxTestCase.java
+JACKTEST_WITHJACK_SRC := tests/com/android/jack/opcodes/opc_goto/jm/T_opc_goto_1.java tests/com/android/jack/opcodes/opc_goto/jm/T_opc_goto_2.java tests/com/android/jack/opcodes/opc_goto/jm/T_opc_goto_5.java
JACKTEST_JUNIT := com.android.jack.opcodes.opc_goto.Test_opc_goto
include $(JACK_RUN_TEST)
@@ -281,8 +281,8 @@ include $(JACK_RUN_TEST)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := opcode-if_gtz
-JACKTEST_WITHDX_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/if_gtz/Test_if_gtz.java $(JACK_PATH)/src/com/android/jack/DxTestCase.java
-JACKTEST_WITHJACK_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/if_gtz/jm/T_if_gtz_1.java $(JACK_PATH)/tests/com/android/jack/opcodes/if_gtz/jm/T_if_gtz_2.java
+JACKTEST_WITHDX_SRC := tests/com/android/jack/opcodes/if_gtz/Test_if_gtz.java src/com/android/jack/DxTestCase.java
+JACKTEST_WITHJACK_SRC := tests/com/android/jack/opcodes/if_gtz/jm/T_if_gtz_1.java tests/com/android/jack/opcodes/if_gtz/jm/T_if_gtz_2.java
JACKTEST_JUNIT := com.android.jack.opcodes.if_gtz.Test_if_gtz
include $(JACK_RUN_TEST)
@@ -292,8 +292,8 @@ include $(JACK_RUN_TEST)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := opcode-or_int
-JACKTEST_WITHDX_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/or_int/Test_or_int.java $(JACK_PATH)/src/com/android/jack/DxTestCase.java
-JACKTEST_WITHJACK_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/or_int/jm/T_or_int_1.java $(JACK_PATH)/tests/com/android/jack/opcodes/or_int/jm/T_or_int_3.java $(JACK_PATH)/tests/com/android/jack/opcodes/or_int/jm/T_or_int_4.java
+JACKTEST_WITHDX_SRC := tests/com/android/jack/opcodes/or_int/Test_or_int.java src/com/android/jack/DxTestCase.java
+JACKTEST_WITHJACK_SRC := tests/com/android/jack/opcodes/or_int/jm/T_or_int_1.java tests/com/android/jack/opcodes/or_int/jm/T_or_int_3.java tests/com/android/jack/opcodes/or_int/jm/T_or_int_4.java
JACKTEST_JUNIT := com.android.jack.opcodes.or_int.Test_or_int
include $(JACK_RUN_TEST)
@@ -303,8 +303,8 @@ include $(JACK_RUN_TEST)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := opcode-int_to_double
-JACKTEST_WITHDX_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/int_to_double/Test_int_to_double.java $(JACK_PATH)/src/com/android/jack/DxTestCase.java
-JACKTEST_WITHJACK_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/int_to_double/jm/T_int_to_double_1.java $(JACK_PATH)/tests/com/android/jack/opcodes/int_to_double/jm/T_int_to_double_3.java $(JACK_PATH)/tests/com/android/jack/opcodes/int_to_double/jm/T_int_to_double_4.java
+JACKTEST_WITHDX_SRC := tests/com/android/jack/opcodes/int_to_double/Test_int_to_double.java src/com/android/jack/DxTestCase.java
+JACKTEST_WITHJACK_SRC := tests/com/android/jack/opcodes/int_to_double/jm/T_int_to_double_1.java tests/com/android/jack/opcodes/int_to_double/jm/T_int_to_double_3.java tests/com/android/jack/opcodes/int_to_double/jm/T_int_to_double_4.java
JACKTEST_JUNIT := com.android.jack.opcodes.int_to_double.Test_int_to_double
include $(JACK_RUN_TEST)
@@ -314,8 +314,8 @@ include $(JACK_RUN_TEST)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := opcode-xor_long
-JACKTEST_WITHDX_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/xor_long/Test_xor_long.java $(JACK_PATH)/src/com/android/jack/DxTestCase.java
-JACKTEST_WITHJACK_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/xor_long/jm/T_xor_long_1.java $(JACK_PATH)/tests/com/android/jack/opcodes/xor_long/jm/T_xor_long_3.java $(JACK_PATH)/tests/com/android/jack/opcodes/xor_long/jm/T_xor_long_4.java $(JACK_PATH)/tests/com/android/jack/opcodes/xor_long/jm/T_xor_long_5.java
+JACKTEST_WITHDX_SRC := tests/com/android/jack/opcodes/xor_long/Test_xor_long.java src/com/android/jack/DxTestCase.java
+JACKTEST_WITHJACK_SRC := tests/com/android/jack/opcodes/xor_long/jm/T_xor_long_1.java tests/com/android/jack/opcodes/xor_long/jm/T_xor_long_3.java tests/com/android/jack/opcodes/xor_long/jm/T_xor_long_4.java tests/com/android/jack/opcodes/xor_long/jm/T_xor_long_5.java
JACKTEST_JUNIT := com.android.jack.opcodes.xor_long.Test_xor_long
include $(JACK_RUN_TEST)
@@ -325,8 +325,8 @@ include $(JACK_RUN_TEST)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := opcode-rem_int
-JACKTEST_WITHDX_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/rem_int/Test_rem_int.java $(JACK_PATH)/src/com/android/jack/DxTestCase.java
-JACKTEST_WITHJACK_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/rem_int/jm/T_rem_int_1.java $(JACK_PATH)/tests/com/android/jack/opcodes/rem_int/jm/T_rem_int_3.java $(JACK_PATH)/tests/com/android/jack/opcodes/rem_int/jm/T_rem_int_4.java
+JACKTEST_WITHDX_SRC := tests/com/android/jack/opcodes/rem_int/Test_rem_int.java src/com/android/jack/DxTestCase.java
+JACKTEST_WITHJACK_SRC := tests/com/android/jack/opcodes/rem_int/jm/T_rem_int_1.java tests/com/android/jack/opcodes/rem_int/jm/T_rem_int_3.java tests/com/android/jack/opcodes/rem_int/jm/T_rem_int_4.java
JACKTEST_JUNIT := com.android.jack.opcodes.rem_int.Test_rem_int
include $(JACK_RUN_TEST)
@@ -336,8 +336,8 @@ include $(JACK_RUN_TEST)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := opcode-opc_throw
-JACKTEST_WITHDX_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/opc_throw/Test_opc_throw.java $(JACK_PATH)/src/com/android/jack/DxTestCase.java
-JACKTEST_WITHJACK_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/opc_throw/jm/T_opc_throw_12.java $(JACK_PATH)/tests/com/android/jack/opcodes/opc_throw/jm/T_opc_throw_1.java $(JACK_PATH)/tests/com/android/jack/opcodes/opc_throw/jm/T_opc_throw_2.java $(JACK_PATH)/tests/com/android/jack/opcodes/opc_throw/jm/T_opc_throw_8.java
+JACKTEST_WITHDX_SRC := tests/com/android/jack/opcodes/opc_throw/Test_opc_throw.java src/com/android/jack/DxTestCase.java
+JACKTEST_WITHJACK_SRC := tests/com/android/jack/opcodes/opc_throw/jm/T_opc_throw_12.java tests/com/android/jack/opcodes/opc_throw/jm/T_opc_throw_1.java tests/com/android/jack/opcodes/opc_throw/jm/T_opc_throw_2.java tests/com/android/jack/opcodes/opc_throw/jm/T_opc_throw_8.java
JACKTEST_JUNIT := com.android.jack.opcodes.opc_throw.Test_opc_throw
include $(JACK_RUN_TEST)
@@ -347,8 +347,8 @@ include $(JACK_RUN_TEST)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := opcode-shr_long
-JACKTEST_WITHDX_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/shr_long/Test_shr_long.java $(JACK_PATH)/src/com/android/jack/DxTestCase.java
-JACKTEST_WITHJACK_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/shr_long/jm/T_shr_long_1.java $(JACK_PATH)/tests/com/android/jack/opcodes/shr_long/jm/T_shr_long_3.java $(JACK_PATH)/tests/com/android/jack/opcodes/shr_long/jm/T_shr_long_4.java $(JACK_PATH)/tests/com/android/jack/opcodes/shr_long/jm/T_shr_long_5.java
+JACKTEST_WITHDX_SRC := tests/com/android/jack/opcodes/shr_long/Test_shr_long.java src/com/android/jack/DxTestCase.java
+JACKTEST_WITHJACK_SRC := tests/com/android/jack/opcodes/shr_long/jm/T_shr_long_1.java tests/com/android/jack/opcodes/shr_long/jm/T_shr_long_3.java tests/com/android/jack/opcodes/shr_long/jm/T_shr_long_4.java tests/com/android/jack/opcodes/shr_long/jm/T_shr_long_5.java
JACKTEST_JUNIT := com.android.jack.opcodes.shr_long.Test_shr_long
include $(JACK_RUN_TEST)
@@ -358,8 +358,8 @@ include $(JACK_RUN_TEST)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := opcode-cmpg_double
-JACKTEST_WITHDX_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/cmpg_double/Test_cmpg_double.java $(JACK_PATH)/src/com/android/jack/DxTestCase.java
-JACKTEST_WITHJACK_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/cmpg_double/jm/T_cmpg_double_1.java $(JACK_PATH)/tests/com/android/jack/opcodes/cmpg_double/jm/T_cmpg_double_2.java
+JACKTEST_WITHDX_SRC := tests/com/android/jack/opcodes/cmpg_double/Test_cmpg_double.java src/com/android/jack/DxTestCase.java
+JACKTEST_WITHJACK_SRC := tests/com/android/jack/opcodes/cmpg_double/jm/T_cmpg_double_1.java tests/com/android/jack/opcodes/cmpg_double/jm/T_cmpg_double_2.java
JACKTEST_JUNIT := com.android.jack.opcodes.cmpg_double.Test_cmpg_double
include $(JACK_RUN_TEST)
@@ -369,8 +369,8 @@ include $(JACK_RUN_TEST)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := opcode-mul_double
-JACKTEST_WITHDX_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/mul_double/Test_mul_double.java $(JACK_PATH)/src/com/android/jack/DxTestCase.java
-JACKTEST_WITHJACK_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/mul_double/jm/T_mul_double_1.java $(JACK_PATH)/tests/com/android/jack/opcodes/mul_double/jm/T_mul_double_3.java $(JACK_PATH)/tests/com/android/jack/opcodes/mul_double/jm/T_mul_double_4.java
+JACKTEST_WITHDX_SRC := tests/com/android/jack/opcodes/mul_double/Test_mul_double.java src/com/android/jack/DxTestCase.java
+JACKTEST_WITHJACK_SRC := tests/com/android/jack/opcodes/mul_double/jm/T_mul_double_1.java tests/com/android/jack/opcodes/mul_double/jm/T_mul_double_3.java tests/com/android/jack/opcodes/mul_double/jm/T_mul_double_4.java
JACKTEST_JUNIT := com.android.jack.opcodes.mul_double.Test_mul_double
include $(JACK_RUN_TEST)
@@ -380,8 +380,8 @@ include $(JACK_RUN_TEST)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := opcode-cmpg_float
-JACKTEST_WITHDX_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/cmpg_float/Test_cmpg_float.java $(JACK_PATH)/src/com/android/jack/DxTestCase.java
-JACKTEST_WITHJACK_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/cmpg_float/jm/T_cmpg_float_1.java $(JACK_PATH)/tests/com/android/jack/opcodes/cmpg_float/jm/T_cmpg_float_2.java
+JACKTEST_WITHDX_SRC := tests/com/android/jack/opcodes/cmpg_float/Test_cmpg_float.java src/com/android/jack/DxTestCase.java
+JACKTEST_WITHJACK_SRC := tests/com/android/jack/opcodes/cmpg_float/jm/T_cmpg_float_1.java tests/com/android/jack/opcodes/cmpg_float/jm/T_cmpg_float_2.java
JACKTEST_JUNIT := com.android.jack.opcodes.cmpg_float.Test_cmpg_float
include $(JACK_RUN_TEST)
@@ -391,8 +391,8 @@ include $(JACK_RUN_TEST)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := opcode-mul_int
-JACKTEST_WITHDX_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/mul_int/Test_mul_int.java $(JACK_PATH)/src/com/android/jack/DxTestCase.java
-JACKTEST_WITHJACK_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/mul_int/jm/T_mul_int_1.java $(JACK_PATH)/tests/com/android/jack/opcodes/mul_int/jm/T_mul_int_3.java $(JACK_PATH)/tests/com/android/jack/opcodes/mul_int/jm/T_mul_int_4.java
+JACKTEST_WITHDX_SRC := tests/com/android/jack/opcodes/mul_int/Test_mul_int.java src/com/android/jack/DxTestCase.java
+JACKTEST_WITHJACK_SRC := tests/com/android/jack/opcodes/mul_int/jm/T_mul_int_1.java tests/com/android/jack/opcodes/mul_int/jm/T_mul_int_3.java tests/com/android/jack/opcodes/mul_int/jm/T_mul_int_4.java
JACKTEST_JUNIT := com.android.jack.opcodes.mul_int.Test_mul_int
include $(JACK_RUN_TEST)
@@ -402,8 +402,8 @@ include $(JACK_RUN_TEST)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := opcode-neg_float
-JACKTEST_WITHDX_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/neg_float/Test_neg_float.java $(JACK_PATH)/src/com/android/jack/DxTestCase.java
-JACKTEST_WITHJACK_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/neg_float/jm/T_neg_float_1.java
+JACKTEST_WITHDX_SRC := tests/com/android/jack/opcodes/neg_float/Test_neg_float.java src/com/android/jack/DxTestCase.java
+JACKTEST_WITHJACK_SRC := tests/com/android/jack/opcodes/neg_float/jm/T_neg_float_1.java
JACKTEST_JUNIT := com.android.jack.opcodes.neg_float.Test_neg_float
include $(JACK_RUN_TEST)
@@ -413,8 +413,8 @@ include $(JACK_RUN_TEST)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := opcode-div_double
-JACKTEST_WITHDX_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/div_double/Test_div_double.java $(JACK_PATH)/src/com/android/jack/DxTestCase.java
-JACKTEST_WITHJACK_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/div_double/jm/T_div_double_1.java $(JACK_PATH)/tests/com/android/jack/opcodes/div_double/jm/T_div_double_3.java $(JACK_PATH)/tests/com/android/jack/opcodes/div_double/jm/T_div_double_4.java
+JACKTEST_WITHDX_SRC := tests/com/android/jack/opcodes/div_double/Test_div_double.java src/com/android/jack/DxTestCase.java
+JACKTEST_WITHJACK_SRC := tests/com/android/jack/opcodes/div_double/jm/T_div_double_1.java tests/com/android/jack/opcodes/div_double/jm/T_div_double_3.java tests/com/android/jack/opcodes/div_double/jm/T_div_double_4.java
JACKTEST_JUNIT := com.android.jack.opcodes.div_double.Test_div_double
include $(JACK_RUN_TEST)
@@ -424,8 +424,8 @@ include $(JACK_RUN_TEST)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := opcode-monitor_enter
-JACKTEST_WITHDX_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/monitor_enter/Test_monitor_enter.java $(JACK_PATH)/src/com/android/jack/DxTestCase.java
-JACKTEST_WITHJACK_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/monitor_enter/jm/T_monitor_enter_1.java $(JACK_PATH)/tests/com/android/jack/opcodes/monitor_enter/jm/T_monitor_enter_2.java $(JACK_PATH)/tests/com/android/jack/opcodes/monitor_enter/jm/T_monitor_enter_4.java
+JACKTEST_WITHDX_SRC := tests/com/android/jack/opcodes/monitor_enter/Test_monitor_enter.java src/com/android/jack/DxTestCase.java
+JACKTEST_WITHJACK_SRC := tests/com/android/jack/opcodes/monitor_enter/jm/T_monitor_enter_1.java tests/com/android/jack/opcodes/monitor_enter/jm/T_monitor_enter_2.java tests/com/android/jack/opcodes/monitor_enter/jm/T_monitor_enter_4.java
JACKTEST_JUNIT := com.android.jack.opcodes.monitor_enter.Test_monitor_enter
include $(JACK_RUN_TEST)
@@ -435,8 +435,8 @@ include $(JACK_RUN_TEST)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := opcode-and_long
-JACKTEST_WITHDX_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/and_long/Test_and_long.java $(JACK_PATH)/src/com/android/jack/DxTestCase.java
-JACKTEST_WITHJACK_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/and_long/jm/T_and_long_1.java $(JACK_PATH)/tests/com/android/jack/opcodes/and_long/jm/T_and_long_3.java $(JACK_PATH)/tests/com/android/jack/opcodes/and_long/jm/T_and_long_4.java
+JACKTEST_WITHDX_SRC := tests/com/android/jack/opcodes/and_long/Test_and_long.java src/com/android/jack/DxTestCase.java
+JACKTEST_WITHJACK_SRC := tests/com/android/jack/opcodes/and_long/jm/T_and_long_1.java tests/com/android/jack/opcodes/and_long/jm/T_and_long_3.java tests/com/android/jack/opcodes/and_long/jm/T_and_long_4.java
JACKTEST_JUNIT := com.android.jack.opcodes.and_long.Test_and_long
include $(JACK_RUN_TEST)
@@ -446,8 +446,8 @@ include $(JACK_RUN_TEST)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := opcode-if_ltz
-JACKTEST_WITHDX_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/if_ltz/Test_if_ltz.java $(JACK_PATH)/src/com/android/jack/DxTestCase.java
-JACKTEST_WITHJACK_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/if_ltz/jm/T_if_ltz_1.java $(JACK_PATH)/tests/com/android/jack/opcodes/if_ltz/jm/T_if_ltz_2.java
+JACKTEST_WITHDX_SRC := tests/com/android/jack/opcodes/if_ltz/Test_if_ltz.java src/com/android/jack/DxTestCase.java
+JACKTEST_WITHJACK_SRC := tests/com/android/jack/opcodes/if_ltz/jm/T_if_ltz_1.java tests/com/android/jack/opcodes/if_ltz/jm/T_if_ltz_2.java
JACKTEST_JUNIT := com.android.jack.opcodes.if_ltz.Test_if_ltz
include $(JACK_RUN_TEST)
@@ -457,8 +457,8 @@ include $(JACK_RUN_TEST)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := opcode-sparse_switch
-JACKTEST_WITHDX_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/sparse_switch/Test_sparse_switch.java $(JACK_PATH)/src/com/android/jack/DxTestCase.java
-JACKTEST_WITHJACK_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/sparse_switch/jm/T_sparse_switch_1.java
+JACKTEST_WITHDX_SRC := tests/com/android/jack/opcodes/sparse_switch/Test_sparse_switch.java src/com/android/jack/DxTestCase.java
+JACKTEST_WITHJACK_SRC := tests/com/android/jack/opcodes/sparse_switch/jm/T_sparse_switch_1.java
JACKTEST_JUNIT := com.android.jack.opcodes.sparse_switch.Test_sparse_switch
include $(JACK_RUN_TEST)
@@ -468,8 +468,8 @@ include $(JACK_RUN_TEST)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := opcode-sget
-JACKTEST_WITHDX_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/sget/TestStubs.java $(JACK_PATH)/tests/com/android/jack/opcodes/sget/Test_sget.java $(JACK_PATH)/src/com/android/jack/DxTestCase.java
-JACKTEST_WITHJACK_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/sget/jm/TestStubs.java $(JACK_PATH)/tests/com/android/jack/opcodes/sget/jm/T_sget_11.java $(JACK_PATH)/tests/com/android/jack/opcodes/sget/jm/T_sget_1.java $(JACK_PATH)/tests/com/android/jack/opcodes/sget/jm/T_sget_2.java $(JACK_PATH)/tests/com/android/jack/opcodes/sget/jm/T_sget_4.java $(JACK_PATH)/tests/com/android/jack/opcodes/sget/jm/T_sget_5.java $(JACK_PATH)/tests/com/android/jack/opcodes/sget/jm/T_sget_9.java
+JACKTEST_WITHDX_SRC := tests/com/android/jack/opcodes/sget/TestStubs.java tests/com/android/jack/opcodes/sget/Test_sget.java src/com/android/jack/DxTestCase.java
+JACKTEST_WITHJACK_SRC := tests/com/android/jack/opcodes/sget/jm/TestStubs.java tests/com/android/jack/opcodes/sget/jm/T_sget_11.java tests/com/android/jack/opcodes/sget/jm/T_sget_1.java tests/com/android/jack/opcodes/sget/jm/T_sget_2.java tests/com/android/jack/opcodes/sget/jm/T_sget_4.java tests/com/android/jack/opcodes/sget/jm/T_sget_5.java tests/com/android/jack/opcodes/sget/jm/T_sget_9.java
JACKTEST_JUNIT := com.android.jack.opcodes.sget.Test_sget
include $(JACK_RUN_TEST)
@@ -479,8 +479,8 @@ include $(JACK_RUN_TEST)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := opcode-ushr_long
-JACKTEST_WITHDX_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/ushr_long/Test_ushr_long.java $(JACK_PATH)/src/com/android/jack/DxTestCase.java
-JACKTEST_WITHJACK_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/ushr_long/jm/T_ushr_long_1.java $(JACK_PATH)/tests/com/android/jack/opcodes/ushr_long/jm/T_ushr_long_3.java $(JACK_PATH)/tests/com/android/jack/opcodes/ushr_long/jm/T_ushr_long_4.java $(JACK_PATH)/tests/com/android/jack/opcodes/ushr_long/jm/T_ushr_long_5.java
+JACKTEST_WITHDX_SRC := tests/com/android/jack/opcodes/ushr_long/Test_ushr_long.java src/com/android/jack/DxTestCase.java
+JACKTEST_WITHJACK_SRC := tests/com/android/jack/opcodes/ushr_long/jm/T_ushr_long_1.java tests/com/android/jack/opcodes/ushr_long/jm/T_ushr_long_3.java tests/com/android/jack/opcodes/ushr_long/jm/T_ushr_long_4.java tests/com/android/jack/opcodes/ushr_long/jm/T_ushr_long_5.java
JACKTEST_JUNIT := com.android.jack.opcodes.ushr_long.Test_ushr_long
include $(JACK_RUN_TEST)
@@ -490,8 +490,8 @@ include $(JACK_RUN_TEST)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := opcode-const_wide
-JACKTEST_WITHDX_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/const_wide/Test_const_wide.java $(JACK_PATH)/src/com/android/jack/DxTestCase.java
-JACKTEST_WITHJACK_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/const_wide/jm/T_const_wide_1.java $(JACK_PATH)/tests/com/android/jack/opcodes/const_wide/jm/T_const_wide_2.java $(JACK_PATH)/tests/com/android/jack/opcodes/const_wide/jm/T_const_wide_3.java $(JACK_PATH)/tests/com/android/jack/opcodes/const_wide/jm/T_const_wide_4.java $(JACK_PATH)/tests/com/android/jack/opcodes/const_wide/jm/T_const_wide_5.java $(JACK_PATH)/tests/com/android/jack/opcodes/const_wide/jm/T_const_wide_6.java $(JACK_PATH)/tests/com/android/jack/opcodes/const_wide/jm/T_const_wide_7.java
+JACKTEST_WITHDX_SRC := tests/com/android/jack/opcodes/const_wide/Test_const_wide.java src/com/android/jack/DxTestCase.java
+JACKTEST_WITHJACK_SRC := tests/com/android/jack/opcodes/const_wide/jm/T_const_wide_1.java tests/com/android/jack/opcodes/const_wide/jm/T_const_wide_2.java tests/com/android/jack/opcodes/const_wide/jm/T_const_wide_3.java tests/com/android/jack/opcodes/const_wide/jm/T_const_wide_4.java tests/com/android/jack/opcodes/const_wide/jm/T_const_wide_5.java tests/com/android/jack/opcodes/const_wide/jm/T_const_wide_6.java tests/com/android/jack/opcodes/const_wide/jm/T_const_wide_7.java
JACKTEST_JUNIT := com.android.jack.opcodes.const_wide.Test_const_wide
include $(JACK_RUN_TEST)
@@ -501,8 +501,8 @@ include $(JACK_RUN_TEST)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := opcode-aget
-JACKTEST_WITHDX_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/aget/Test_aget.java $(JACK_PATH)/src/com/android/jack/DxTestCase.java
-JACKTEST_WITHJACK_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/aget/jm/T_aget_1.java $(JACK_PATH)/tests/com/android/jack/opcodes/aget/jm/T_aget_2.java $(JACK_PATH)/tests/com/android/jack/opcodes/aget/jm/T_aget_3.java $(JACK_PATH)/tests/com/android/jack/opcodes/aget/jm/T_aget_4.java $(JACK_PATH)/tests/com/android/jack/opcodes/aget/jm/T_aget_5.java $(JACK_PATH)/tests/com/android/jack/opcodes/aget/jm/T_aget_6.java
+JACKTEST_WITHDX_SRC := tests/com/android/jack/opcodes/aget/Test_aget.java src/com/android/jack/DxTestCase.java
+JACKTEST_WITHJACK_SRC := tests/com/android/jack/opcodes/aget/jm/T_aget_1.java tests/com/android/jack/opcodes/aget/jm/T_aget_2.java tests/com/android/jack/opcodes/aget/jm/T_aget_3.java tests/com/android/jack/opcodes/aget/jm/T_aget_4.java tests/com/android/jack/opcodes/aget/jm/T_aget_5.java tests/com/android/jack/opcodes/aget/jm/T_aget_6.java
JACKTEST_JUNIT := com.android.jack.opcodes.aget.Test_aget
include $(JACK_RUN_TEST)
@@ -512,8 +512,8 @@ include $(JACK_RUN_TEST)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := opcode-iput
-JACKTEST_WITHDX_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/iput/Test_iput.java $(JACK_PATH)/tests/com/android/jack/opcodes/iput/TIput.java $(JACK_PATH)/src/com/android/jack/DxTestCase.java
-JACKTEST_WITHJACK_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/iput/jm/TestStubs.java $(JACK_PATH)/tests/com/android/jack/opcodes/iput/jm/T_iput_12.java $(JACK_PATH)/tests/com/android/jack/opcodes/iput/jm/T_iput_14.java $(JACK_PATH)/tests/com/android/jack/opcodes/iput/jm/T_iput_16.java $(JACK_PATH)/tests/com/android/jack/opcodes/iput/jm/T_iput_18.java $(JACK_PATH)/tests/com/android/jack/opcodes/iput/jm/T_iput_1.java $(JACK_PATH)/tests/com/android/jack/opcodes/iput/jm/T_iput_2.java
+JACKTEST_WITHDX_SRC := tests/com/android/jack/opcodes/iput/Test_iput.java tests/com/android/jack/opcodes/iput/TIput.java src/com/android/jack/DxTestCase.java
+JACKTEST_WITHJACK_SRC := tests/com/android/jack/opcodes/iput/jm/TestStubs.java tests/com/android/jack/opcodes/iput/jm/T_iput_12.java tests/com/android/jack/opcodes/iput/jm/T_iput_14.java tests/com/android/jack/opcodes/iput/jm/T_iput_16.java tests/com/android/jack/opcodes/iput/jm/T_iput_18.java tests/com/android/jack/opcodes/iput/jm/T_iput_1.java tests/com/android/jack/opcodes/iput/jm/T_iput_2.java
JACKTEST_JUNIT := com.android.jack.opcodes.iput.Test_iput
include $(JACK_RUN_TEST)
@@ -523,8 +523,8 @@ include $(JACK_RUN_TEST)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := opcode-sput
-JACKTEST_WITHDX_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/sput/TestStubs.java $(JACK_PATH)/tests/com/android/jack/opcodes/sput/Test_sput.java $(JACK_PATH)/src/com/android/jack/DxTestCase.java
-JACKTEST_WITHJACK_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/sput/jm/TestStubs.java $(JACK_PATH)/tests/com/android/jack/opcodes/sput/jm/T_sput_13.java $(JACK_PATH)/tests/com/android/jack/opcodes/sput/jm/T_sput_14.java $(JACK_PATH)/tests/com/android/jack/opcodes/sput/jm/T_sput_16.java $(JACK_PATH)/tests/com/android/jack/opcodes/sput/jm/T_sput_18.java $(JACK_PATH)/tests/com/android/jack/opcodes/sput/jm/T_sput_1.java $(JACK_PATH)/tests/com/android/jack/opcodes/sput/jm/T_sput_2.java $(JACK_PATH)/tests/com/android/jack/opcodes/sput/jm/T_sput_6.java
+JACKTEST_WITHDX_SRC := tests/com/android/jack/opcodes/sput/TestStubs.java tests/com/android/jack/opcodes/sput/Test_sput.java src/com/android/jack/DxTestCase.java
+JACKTEST_WITHJACK_SRC := tests/com/android/jack/opcodes/sput/jm/TestStubs.java tests/com/android/jack/opcodes/sput/jm/T_sput_13.java tests/com/android/jack/opcodes/sput/jm/T_sput_14.java tests/com/android/jack/opcodes/sput/jm/T_sput_16.java tests/com/android/jack/opcodes/sput/jm/T_sput_18.java tests/com/android/jack/opcodes/sput/jm/T_sput_1.java tests/com/android/jack/opcodes/sput/jm/T_sput_2.java tests/com/android/jack/opcodes/sput/jm/T_sput_6.java
JACKTEST_JUNIT := com.android.jack.opcodes.sput.Test_sput
include $(JACK_RUN_TEST)
@@ -534,8 +534,8 @@ include $(JACK_RUN_TEST)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := opcode-return_object
-JACKTEST_WITHDX_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/return_object/Test_return_object.java $(JACK_PATH)/tests/com/android/jack/opcodes/return_object/Runner.java $(JACK_PATH)/tests/com/android/jack/opcodes/return_object/RunnerGenerator.java $(JACK_PATH)/src/com/android/jack/DxTestCase.java
-JACKTEST_WITHJACK_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/return_object/jm/T_return_object_12.java $(JACK_PATH)/tests/com/android/jack/opcodes/return_object/jm/T_return_object_13.java $(JACK_PATH)/tests/com/android/jack/opcodes/return_object/jm/T_return_object_15.java $(JACK_PATH)/tests/com/android/jack/opcodes/return_object/jm/T_return_object_1.java $(JACK_PATH)/tests/com/android/jack/opcodes/return_object/jm/T_return_object_2.java $(JACK_PATH)/tests/com/android/jack/opcodes/return_object/jm/T_return_object_3.java $(JACK_PATH)/tests/com/android/jack/opcodes/return_object/jm/T_return_object_6.java $(JACK_PATH)/tests/com/android/jack/opcodes/return_object/jm/T_return_object_7.java $(JACK_PATH)/tests/com/android/jack/opcodes/return_object/jm/T_return_object_9.java $(JACK_PATH)/tests/com/android/jack/opcodes/return_object/jm/TetsStubs.java
+JACKTEST_WITHDX_SRC := tests/com/android/jack/opcodes/return_object/Test_return_object.java tests/com/android/jack/opcodes/return_object/Runner.java tests/com/android/jack/opcodes/return_object/RunnerGenerator.java src/com/android/jack/DxTestCase.java
+JACKTEST_WITHJACK_SRC := tests/com/android/jack/opcodes/return_object/jm/T_return_object_12.java tests/com/android/jack/opcodes/return_object/jm/T_return_object_13.java tests/com/android/jack/opcodes/return_object/jm/T_return_object_15.java tests/com/android/jack/opcodes/return_object/jm/T_return_object_1.java tests/com/android/jack/opcodes/return_object/jm/T_return_object_2.java tests/com/android/jack/opcodes/return_object/jm/T_return_object_3.java tests/com/android/jack/opcodes/return_object/jm/T_return_object_6.java tests/com/android/jack/opcodes/return_object/jm/T_return_object_7.java tests/com/android/jack/opcodes/return_object/jm/T_return_object_9.java tests/com/android/jack/opcodes/return_object/jm/TetsStubs.java
JACKTEST_JUNIT := com.android.jack.opcodes.return_object.Test_return_object
include $(JACK_RUN_TEST)
@@ -545,8 +545,8 @@ include $(JACK_RUN_TEST)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := opcode-invoke_virtual
-JACKTEST_WITHDX_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/invoke_virtual/TProtected.java $(JACK_PATH)/tests/com/android/jack/opcodes/invoke_virtual/Test_invoke_virtual.java $(JACK_PATH)/src/com/android/jack/DxTestCase.java
-JACKTEST_WITHJACK_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/invoke_virtual/jm/ATest.java $(JACK_PATH)/tests/com/android/jack/opcodes/invoke_virtual/jm/T_invoke_virtual_13.java $(JACK_PATH)/tests/com/android/jack/opcodes/invoke_virtual/jm/T_invoke_virtual_14.java $(JACK_PATH)/tests/com/android/jack/opcodes/invoke_virtual/jm/T_invoke_virtual_17.java $(JACK_PATH)/tests/com/android/jack/opcodes/invoke_virtual/jm/T_invoke_virtual_19.java $(JACK_PATH)/tests/com/android/jack/opcodes/invoke_virtual/jm/T_invoke_virtual_1.java $(JACK_PATH)/tests/com/android/jack/opcodes/invoke_virtual/jm/T_invoke_virtual_22.java $(JACK_PATH)/tests/com/android/jack/opcodes/invoke_virtual/jm/T_invoke_virtual_23.java $(JACK_PATH)/tests/com/android/jack/opcodes/invoke_virtual/jm/T_invoke_virtual_2.java $(JACK_PATH)/tests/com/android/jack/opcodes/invoke_virtual/jm/T_invoke_virtual_4.java $(JACK_PATH)/tests/com/android/jack/opcodes/invoke_virtual/jm/T_invoke_virtual_7.java $(JACK_PATH)/tests/com/android/jack/opcodes/invoke_virtual/jm/TPlain.java $(JACK_PATH)/tests/com/android/jack/opcodes/invoke_virtual/jm/TSuper2.java $(JACK_PATH)/tests/com/android/jack/opcodes/invoke_virtual/jm/TSuper.java
+JACKTEST_WITHDX_SRC := tests/com/android/jack/opcodes/invoke_virtual/TProtected.java tests/com/android/jack/opcodes/invoke_virtual/Test_invoke_virtual.java src/com/android/jack/DxTestCase.java
+JACKTEST_WITHJACK_SRC := tests/com/android/jack/opcodes/invoke_virtual/jm/ATest.java tests/com/android/jack/opcodes/invoke_virtual/jm/T_invoke_virtual_13.java tests/com/android/jack/opcodes/invoke_virtual/jm/T_invoke_virtual_14.java tests/com/android/jack/opcodes/invoke_virtual/jm/T_invoke_virtual_17.java tests/com/android/jack/opcodes/invoke_virtual/jm/T_invoke_virtual_19.java tests/com/android/jack/opcodes/invoke_virtual/jm/T_invoke_virtual_1.java tests/com/android/jack/opcodes/invoke_virtual/jm/T_invoke_virtual_22.java tests/com/android/jack/opcodes/invoke_virtual/jm/T_invoke_virtual_23.java tests/com/android/jack/opcodes/invoke_virtual/jm/T_invoke_virtual_2.java tests/com/android/jack/opcodes/invoke_virtual/jm/T_invoke_virtual_4.java tests/com/android/jack/opcodes/invoke_virtual/jm/T_invoke_virtual_7.java tests/com/android/jack/opcodes/invoke_virtual/jm/TPlain.java tests/com/android/jack/opcodes/invoke_virtual/jm/TSuper2.java tests/com/android/jack/opcodes/invoke_virtual/jm/TSuper.java
JACKTEST_JUNIT := com.android.jack.opcodes.invoke_virtual.Test_invoke_virtual
include $(JACK_RUN_TEST)
@@ -556,8 +556,8 @@ include $(JACK_RUN_TEST)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := opcode-aget_object
-JACKTEST_WITHDX_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/aget_object/Test_aget_object.java $(JACK_PATH)/src/com/android/jack/DxTestCase.java
-JACKTEST_WITHJACK_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/aget_object/jm/T_aget_object_1.java $(JACK_PATH)/tests/com/android/jack/opcodes/aget_object/jm/T_aget_object_4.java $(JACK_PATH)/tests/com/android/jack/opcodes/aget_object/jm/T_aget_object_5.java $(JACK_PATH)/tests/com/android/jack/opcodes/aget_object/jm/T_aget_object_6.java $(JACK_PATH)/tests/com/android/jack/opcodes/aget_object/jm/T_aget_object_7.java $(JACK_PATH)/tests/com/android/jack/opcodes/aget_object/jm/T_aget_object_8.java $(JACK_PATH)/tests/com/android/jack/opcodes/aget_object/jm/T_aget_object_9.java
+JACKTEST_WITHDX_SRC := tests/com/android/jack/opcodes/aget_object/Test_aget_object.java src/com/android/jack/DxTestCase.java
+JACKTEST_WITHJACK_SRC := tests/com/android/jack/opcodes/aget_object/jm/T_aget_object_1.java tests/com/android/jack/opcodes/aget_object/jm/T_aget_object_4.java tests/com/android/jack/opcodes/aget_object/jm/T_aget_object_5.java tests/com/android/jack/opcodes/aget_object/jm/T_aget_object_6.java tests/com/android/jack/opcodes/aget_object/jm/T_aget_object_7.java tests/com/android/jack/opcodes/aget_object/jm/T_aget_object_8.java tests/com/android/jack/opcodes/aget_object/jm/T_aget_object_9.java
JACKTEST_JUNIT := com.android.jack.opcodes.aget_object.Test_aget_object
include $(JACK_RUN_TEST)
@@ -567,8 +567,8 @@ include $(JACK_RUN_TEST)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := opcode-neg_double
-JACKTEST_WITHDX_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/neg_double/Test_neg_double.java $(JACK_PATH)/src/com/android/jack/DxTestCase.java
-JACKTEST_WITHJACK_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/neg_double/jm/T_neg_double_1.java
+JACKTEST_WITHDX_SRC := tests/com/android/jack/opcodes/neg_double/Test_neg_double.java src/com/android/jack/DxTestCase.java
+JACKTEST_WITHJACK_SRC := tests/com/android/jack/opcodes/neg_double/jm/T_neg_double_1.java
JACKTEST_JUNIT := com.android.jack.opcodes.neg_double.Test_neg_double
include $(JACK_RUN_TEST)
@@ -578,8 +578,8 @@ include $(JACK_RUN_TEST)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := opcode-int_to_float
-JACKTEST_WITHDX_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/int_to_float/Test_int_to_float.java $(JACK_PATH)/src/com/android/jack/DxTestCase.java
-JACKTEST_WITHJACK_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/int_to_float/jm/T_int_to_float_1.java $(JACK_PATH)/tests/com/android/jack/opcodes/int_to_float/jm/T_int_to_float_3.java $(JACK_PATH)/tests/com/android/jack/opcodes/int_to_float/jm/T_int_to_float_4.java
+JACKTEST_WITHDX_SRC := tests/com/android/jack/opcodes/int_to_float/Test_int_to_float.java src/com/android/jack/DxTestCase.java
+JACKTEST_WITHJACK_SRC := tests/com/android/jack/opcodes/int_to_float/jm/T_int_to_float_1.java tests/com/android/jack/opcodes/int_to_float/jm/T_int_to_float_3.java tests/com/android/jack/opcodes/int_to_float/jm/T_int_to_float_4.java
JACKTEST_JUNIT := com.android.jack.opcodes.int_to_float.Test_int_to_float
include $(JACK_RUN_TEST)
@@ -589,8 +589,8 @@ include $(JACK_RUN_TEST)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := opcode-invoke_static
-JACKTEST_WITHDX_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/invoke_static/TestStubs.java $(JACK_PATH)/tests/com/android/jack/opcodes/invoke_static/Test_invoke_static.java $(JACK_PATH)/src/com/android/jack/DxTestCase.java
-JACKTEST_WITHJACK_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/invoke_static/jm/TestClassAbstract.java $(JACK_PATH)/tests/com/android/jack/opcodes/invoke_static/jm/TestClassInitError.java $(JACK_PATH)/tests/com/android/jack/opcodes/invoke_static/jm/TestClass.java $(JACK_PATH)/tests/com/android/jack/opcodes/invoke_static/jm/T_invoke_static_12.java $(JACK_PATH)/tests/com/android/jack/opcodes/invoke_static/jm/T_invoke_static_13.java $(JACK_PATH)/tests/com/android/jack/opcodes/invoke_static/jm/T_invoke_static_14.java $(JACK_PATH)/tests/com/android/jack/opcodes/invoke_static/jm/T_invoke_static_15.java $(JACK_PATH)/tests/com/android/jack/opcodes/invoke_static/jm/T_invoke_static_18.java $(JACK_PATH)/tests/com/android/jack/opcodes/invoke_static/jm/T_invoke_static_1.java $(JACK_PATH)/tests/com/android/jack/opcodes/invoke_static/jm/T_invoke_static_20.java $(JACK_PATH)/tests/com/android/jack/opcodes/invoke_static/jm/T_invoke_static_2.java $(JACK_PATH)/tests/com/android/jack/opcodes/invoke_static/jm/T_invoke_static_4.java $(JACK_PATH)/tests/com/android/jack/opcodes/invoke_static/jm/T_invoke_static_5.java $(JACK_PATH)/tests/com/android/jack/opcodes/invoke_static/jm/T_invoke_static_6.java $(JACK_PATH)/tests/com/android/jack/opcodes/invoke_static/jm/T_invoke_static_7.java $(JACK_PATH)/tests/com/android/jack/opcodes/invoke_static/jm/T_invoke_static_8.java
+JACKTEST_WITHDX_SRC := tests/com/android/jack/opcodes/invoke_static/TestStubs.java tests/com/android/jack/opcodes/invoke_static/Test_invoke_static.java src/com/android/jack/DxTestCase.java
+JACKTEST_WITHJACK_SRC := tests/com/android/jack/opcodes/invoke_static/jm/TestClassAbstract.java tests/com/android/jack/opcodes/invoke_static/jm/TestClassInitError.java tests/com/android/jack/opcodes/invoke_static/jm/TestClass.java tests/com/android/jack/opcodes/invoke_static/jm/T_invoke_static_12.java tests/com/android/jack/opcodes/invoke_static/jm/T_invoke_static_13.java tests/com/android/jack/opcodes/invoke_static/jm/T_invoke_static_14.java tests/com/android/jack/opcodes/invoke_static/jm/T_invoke_static_15.java tests/com/android/jack/opcodes/invoke_static/jm/T_invoke_static_18.java tests/com/android/jack/opcodes/invoke_static/jm/T_invoke_static_1.java tests/com/android/jack/opcodes/invoke_static/jm/T_invoke_static_20.java tests/com/android/jack/opcodes/invoke_static/jm/T_invoke_static_2.java tests/com/android/jack/opcodes/invoke_static/jm/T_invoke_static_4.java tests/com/android/jack/opcodes/invoke_static/jm/T_invoke_static_5.java tests/com/android/jack/opcodes/invoke_static/jm/T_invoke_static_6.java tests/com/android/jack/opcodes/invoke_static/jm/T_invoke_static_7.java tests/com/android/jack/opcodes/invoke_static/jm/T_invoke_static_8.java
JACKTEST_JUNIT := com.android.jack.opcodes.invoke_static.Test_invoke_static
include $(JACK_RUN_TEST)
@@ -600,8 +600,8 @@ include $(JACK_RUN_TEST)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := opcode-rem_long
-JACKTEST_WITHDX_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/rem_long/Test_rem_long.java $(JACK_PATH)/src/com/android/jack/DxTestCase.java
-JACKTEST_WITHJACK_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/rem_long/jm/T_rem_long_1.java $(JACK_PATH)/tests/com/android/jack/opcodes/rem_long/jm/T_rem_long_3.java $(JACK_PATH)/tests/com/android/jack/opcodes/rem_long/jm/T_rem_long_4.java $(JACK_PATH)/tests/com/android/jack/opcodes/rem_long/jm/T_rem_long_5.java
+JACKTEST_WITHDX_SRC := tests/com/android/jack/opcodes/rem_long/Test_rem_long.java src/com/android/jack/DxTestCase.java
+JACKTEST_WITHJACK_SRC := tests/com/android/jack/opcodes/rem_long/jm/T_rem_long_1.java tests/com/android/jack/opcodes/rem_long/jm/T_rem_long_3.java tests/com/android/jack/opcodes/rem_long/jm/T_rem_long_4.java tests/com/android/jack/opcodes/rem_long/jm/T_rem_long_5.java
JACKTEST_JUNIT := com.android.jack.opcodes.rem_long.Test_rem_long
include $(JACK_RUN_TEST)
@@ -611,8 +611,8 @@ include $(JACK_RUN_TEST)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := opcode-aget_wide
-JACKTEST_WITHDX_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/aget_wide/Test_aget_wide.java $(JACK_PATH)/src/com/android/jack/DxTestCase.java
-JACKTEST_WITHJACK_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/aget_wide/jm/T_aget_wide_1.java $(JACK_PATH)/tests/com/android/jack/opcodes/aget_wide/jm/T_aget_wide_2.java $(JACK_PATH)/tests/com/android/jack/opcodes/aget_wide/jm/T_aget_wide_3.java $(JACK_PATH)/tests/com/android/jack/opcodes/aget_wide/jm/T_aget_wide_4.java $(JACK_PATH)/tests/com/android/jack/opcodes/aget_wide/jm/T_aget_wide_5.java
+JACKTEST_WITHDX_SRC := tests/com/android/jack/opcodes/aget_wide/Test_aget_wide.java src/com/android/jack/DxTestCase.java
+JACKTEST_WITHJACK_SRC := tests/com/android/jack/opcodes/aget_wide/jm/T_aget_wide_1.java tests/com/android/jack/opcodes/aget_wide/jm/T_aget_wide_2.java tests/com/android/jack/opcodes/aget_wide/jm/T_aget_wide_3.java tests/com/android/jack/opcodes/aget_wide/jm/T_aget_wide_4.java tests/com/android/jack/opcodes/aget_wide/jm/T_aget_wide_5.java
JACKTEST_JUNIT := com.android.jack.opcodes.aget_wide.Test_aget_wide
include $(JACK_RUN_TEST)
@@ -622,8 +622,8 @@ include $(JACK_RUN_TEST)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := opcode-float_to_double
-JACKTEST_WITHDX_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/float_to_double/Test_float_to_double.java $(JACK_PATH)/src/com/android/jack/DxTestCase.java
-JACKTEST_WITHJACK_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/float_to_double/jm/T_float_to_double_1.java $(JACK_PATH)/tests/com/android/jack/opcodes/float_to_double/jm/T_float_to_double_3.java $(JACK_PATH)/tests/com/android/jack/opcodes/float_to_double/jm/T_float_to_double_4.java
+JACKTEST_WITHDX_SRC := tests/com/android/jack/opcodes/float_to_double/Test_float_to_double.java src/com/android/jack/DxTestCase.java
+JACKTEST_WITHJACK_SRC := tests/com/android/jack/opcodes/float_to_double/jm/T_float_to_double_1.java tests/com/android/jack/opcodes/float_to_double/jm/T_float_to_double_3.java tests/com/android/jack/opcodes/float_to_double/jm/T_float_to_double_4.java
JACKTEST_JUNIT := com.android.jack.opcodes.float_to_double.Test_float_to_double
include $(JACK_RUN_TEST)
@@ -633,8 +633,8 @@ include $(JACK_RUN_TEST)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := opcode-if_lt
-JACKTEST_WITHDX_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/if_lt/Test_if_lt.java $(JACK_PATH)/src/com/android/jack/DxTestCase.java
-JACKTEST_WITHJACK_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/if_lt/jm/T_if_lt_1.java $(JACK_PATH)/tests/com/android/jack/opcodes/if_lt/jm/T_if_lt_2.java
+JACKTEST_WITHDX_SRC := tests/com/android/jack/opcodes/if_lt/Test_if_lt.java src/com/android/jack/DxTestCase.java
+JACKTEST_WITHJACK_SRC := tests/com/android/jack/opcodes/if_lt/jm/T_if_lt_1.java tests/com/android/jack/opcodes/if_lt/jm/T_if_lt_2.java
JACKTEST_JUNIT := com.android.jack.opcodes.if_lt.Test_if_lt
include $(JACK_RUN_TEST)
@@ -644,8 +644,8 @@ include $(JACK_RUN_TEST)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := opcode-double_to_float
-JACKTEST_WITHDX_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/double_to_float/Test_double_to_float.java $(JACK_PATH)/src/com/android/jack/DxTestCase.java
-JACKTEST_WITHJACK_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/double_to_float/jm/T_double_to_float_1.java $(JACK_PATH)/tests/com/android/jack/opcodes/double_to_float/jm/T_double_to_float_3.java $(JACK_PATH)/tests/com/android/jack/opcodes/double_to_float/jm/T_double_to_float_4.java
+JACKTEST_WITHDX_SRC := tests/com/android/jack/opcodes/double_to_float/Test_double_to_float.java src/com/android/jack/DxTestCase.java
+JACKTEST_WITHJACK_SRC := tests/com/android/jack/opcodes/double_to_float/jm/T_double_to_float_1.java tests/com/android/jack/opcodes/double_to_float/jm/T_double_to_float_3.java tests/com/android/jack/opcodes/double_to_float/jm/T_double_to_float_4.java
JACKTEST_JUNIT := com.android.jack.opcodes.double_to_float.Test_double_to_float
include $(JACK_RUN_TEST)
@@ -655,8 +655,8 @@ include $(JACK_RUN_TEST)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := opcode-double_to_long
-JACKTEST_WITHDX_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/double_to_long/Test_double_to_long.java $(JACK_PATH)/src/com/android/jack/DxTestCase.java
-JACKTEST_WITHJACK_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/double_to_long/jm/T_double_to_long_1.java $(JACK_PATH)/tests/com/android/jack/opcodes/double_to_long/jm/T_double_to_long_3.java $(JACK_PATH)/tests/com/android/jack/opcodes/double_to_long/jm/T_double_to_long_4.java
+JACKTEST_WITHDX_SRC := tests/com/android/jack/opcodes/double_to_long/Test_double_to_long.java src/com/android/jack/DxTestCase.java
+JACKTEST_WITHJACK_SRC := tests/com/android/jack/opcodes/double_to_long/jm/T_double_to_long_1.java tests/com/android/jack/opcodes/double_to_long/jm/T_double_to_long_3.java tests/com/android/jack/opcodes/double_to_long/jm/T_double_to_long_4.java
JACKTEST_JUNIT := com.android.jack.opcodes.double_to_long.Test_double_to_long
include $(JACK_RUN_TEST)
@@ -666,8 +666,8 @@ include $(JACK_RUN_TEST)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := opcode-return_wide
-JACKTEST_WITHDX_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/return_wide/Test_return_wide.java $(JACK_PATH)/src/com/android/jack/DxTestCase.java
-JACKTEST_WITHJACK_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/return_wide/jm/T_return_wide_1.java $(JACK_PATH)/tests/com/android/jack/opcodes/return_wide/jm/T_return_wide_2.java $(JACK_PATH)/tests/com/android/jack/opcodes/return_wide/jm/T_return_wide_6.java $(JACK_PATH)/tests/com/android/jack/opcodes/return_wide/jm/T_return_wide_7.java $(JACK_PATH)/tests/com/android/jack/opcodes/return_wide/jm/T_return_wide_8.java $(JACK_PATH)/tests/com/android/jack/opcodes/return_wide/jm/T_return_wide_9.java $(JACK_PATH)/tests/com/android/jack/opcodes/return_wide/jm/T_return_wide_10.java $(JACK_PATH)/tests/com/android/jack/opcodes/return_wide/jm/T_return_wide_11.java $(JACK_PATH)/tests/com/android/jack/opcodes/return_wide/jm/T_return_wide_12.java $(JACK_PATH)/tests/com/android/jack/opcodes/return_wide/jm/T_return_wide_13.java $(JACK_PATH)/tests/com/android/jack/opcodes/return_wide/jm/T_return_wide_14.java
+JACKTEST_WITHDX_SRC := tests/com/android/jack/opcodes/return_wide/Test_return_wide.java src/com/android/jack/DxTestCase.java
+JACKTEST_WITHJACK_SRC := tests/com/android/jack/opcodes/return_wide/jm/T_return_wide_1.java tests/com/android/jack/opcodes/return_wide/jm/T_return_wide_2.java tests/com/android/jack/opcodes/return_wide/jm/T_return_wide_6.java tests/com/android/jack/opcodes/return_wide/jm/T_return_wide_7.java tests/com/android/jack/opcodes/return_wide/jm/T_return_wide_8.java tests/com/android/jack/opcodes/return_wide/jm/T_return_wide_9.java tests/com/android/jack/opcodes/return_wide/jm/T_return_wide_10.java tests/com/android/jack/opcodes/return_wide/jm/T_return_wide_11.java tests/com/android/jack/opcodes/return_wide/jm/T_return_wide_12.java tests/com/android/jack/opcodes/return_wide/jm/T_return_wide_13.java tests/com/android/jack/opcodes/return_wide/jm/T_return_wide_14.java
JACKTEST_JUNIT := com.android.jack.opcodes.return_wide.Test_return_wide
include $(JACK_RUN_TEST)
@@ -677,8 +677,8 @@ include $(JACK_RUN_TEST)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := opcode-add_long
-JACKTEST_WITHDX_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/add_long/Test_add_long.java $(JACK_PATH)/src/com/android/jack/DxTestCase.java
-JACKTEST_WITHJACK_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/add_long/jm/T_add_long_1.java $(JACK_PATH)/tests/com/android/jack/opcodes/add_long/jm/T_add_long_3.java $(JACK_PATH)/tests/com/android/jack/opcodes/add_long/jm/T_add_long_4.java $(JACK_PATH)/tests/com/android/jack/opcodes/add_long/jm/T_add_long_5.java
+JACKTEST_WITHDX_SRC := tests/com/android/jack/opcodes/add_long/Test_add_long.java src/com/android/jack/DxTestCase.java
+JACKTEST_WITHJACK_SRC := tests/com/android/jack/opcodes/add_long/jm/T_add_long_1.java tests/com/android/jack/opcodes/add_long/jm/T_add_long_3.java tests/com/android/jack/opcodes/add_long/jm/T_add_long_4.java tests/com/android/jack/opcodes/add_long/jm/T_add_long_5.java
JACKTEST_JUNIT := com.android.jack.opcodes.add_long.Test_add_long
include $(JACK_RUN_TEST)
@@ -688,8 +688,8 @@ include $(JACK_RUN_TEST)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := opcode-sub_long
-JACKTEST_WITHDX_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/sub_long/Test_sub_long.java $(JACK_PATH)/src/com/android/jack/DxTestCase.java
-JACKTEST_WITHJACK_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/sub_long/jm/T_sub_long_1.java $(JACK_PATH)/tests/com/android/jack/opcodes/sub_long/jm/T_sub_long_3.java $(JACK_PATH)/tests/com/android/jack/opcodes/sub_long/jm/T_sub_long_4.java $(JACK_PATH)/tests/com/android/jack/opcodes/sub_long/jm/T_sub_long_5.java
+JACKTEST_WITHDX_SRC := tests/com/android/jack/opcodes/sub_long/Test_sub_long.java src/com/android/jack/DxTestCase.java
+JACKTEST_WITHJACK_SRC := tests/com/android/jack/opcodes/sub_long/jm/T_sub_long_1.java tests/com/android/jack/opcodes/sub_long/jm/T_sub_long_3.java tests/com/android/jack/opcodes/sub_long/jm/T_sub_long_4.java tests/com/android/jack/opcodes/sub_long/jm/T_sub_long_5.java
JACKTEST_JUNIT := com.android.jack.opcodes.sub_long.Test_sub_long
include $(JACK_RUN_TEST)
@@ -699,8 +699,8 @@ include $(JACK_RUN_TEST)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := opcode-shl_long
-JACKTEST_WITHDX_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/shl_long/Test_shl_long.java $(JACK_PATH)/src/com/android/jack/DxTestCase.java
-JACKTEST_WITHJACK_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/shl_long/jm/T_shl_long_1.java $(JACK_PATH)/tests/com/android/jack/opcodes/shl_long/jm/T_shl_long_3.java $(JACK_PATH)/tests/com/android/jack/opcodes/shl_long/jm/T_shl_long_4.java $(JACK_PATH)/tests/com/android/jack/opcodes/shl_long/jm/T_shl_long_5.java
+JACKTEST_WITHDX_SRC := tests/com/android/jack/opcodes/shl_long/Test_shl_long.java src/com/android/jack/DxTestCase.java
+JACKTEST_WITHJACK_SRC := tests/com/android/jack/opcodes/shl_long/jm/T_shl_long_1.java tests/com/android/jack/opcodes/shl_long/jm/T_shl_long_3.java tests/com/android/jack/opcodes/shl_long/jm/T_shl_long_4.java tests/com/android/jack/opcodes/shl_long/jm/T_shl_long_5.java
JACKTEST_JUNIT := com.android.jack.opcodes.shl_long.Test_shl_long
include $(JACK_RUN_TEST)
@@ -710,8 +710,8 @@ include $(JACK_RUN_TEST)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := opcode-aput_byte
-JACKTEST_WITHDX_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/aput_byte/Test_aput_byte.java $(JACK_PATH)/src/com/android/jack/DxTestCase.java
-JACKTEST_WITHJACK_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/aput_byte/jm/T_aput_byte_1.java
+JACKTEST_WITHDX_SRC := tests/com/android/jack/opcodes/aput_byte/Test_aput_byte.java src/com/android/jack/DxTestCase.java
+JACKTEST_WITHJACK_SRC := tests/com/android/jack/opcodes/aput_byte/jm/T_aput_byte_1.java
JACKTEST_JUNIT := com.android.jack.opcodes.aput_byte.Test_aput_byte
include $(JACK_RUN_TEST)
@@ -721,8 +721,8 @@ include $(JACK_RUN_TEST)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := opcode-aget_char
-JACKTEST_WITHDX_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/aget_char/Test_aget_char.java $(JACK_PATH)/src/com/android/jack/DxTestCase.java
-JACKTEST_WITHJACK_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/aget_char/jm/T_aget_char_1.java
+JACKTEST_WITHDX_SRC := tests/com/android/jack/opcodes/aget_char/Test_aget_char.java src/com/android/jack/DxTestCase.java
+JACKTEST_WITHJACK_SRC := tests/com/android/jack/opcodes/aget_char/jm/T_aget_char_1.java
JACKTEST_JUNIT := com.android.jack.opcodes.aget_char.Test_aget_char
include $(JACK_RUN_TEST)
@@ -732,8 +732,8 @@ include $(JACK_RUN_TEST)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := opcode-const4_16
-JACKTEST_WITHDX_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/const4_16/Test_const4_16.java $(JACK_PATH)/src/com/android/jack/DxTestCase.java
-JACKTEST_WITHJACK_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/const4_16/jm/T_const4_16_1.java $(JACK_PATH)/tests/com/android/jack/opcodes/const4_16/jm/T_const4_16_2.java $(JACK_PATH)/tests/com/android/jack/opcodes/const4_16/jm/T_const4_16_3.java $(JACK_PATH)/tests/com/android/jack/opcodes/const4_16/jm/T_const4_16_4.java $(JACK_PATH)/tests/com/android/jack/opcodes/const4_16/jm/T_const4_16_5.java $(JACK_PATH)/tests/com/android/jack/opcodes/const4_16/jm/T_const4_16_6.java $(JACK_PATH)/tests/com/android/jack/opcodes/const4_16/jm/T_const4_16_7.java $(JACK_PATH)/tests/com/android/jack/opcodes/const4_16/jm/T_const4_16_8.java $(JACK_PATH)/tests/com/android/jack/opcodes/const4_16/jm/T_const4_16_9.java $(JACK_PATH)/tests/com/android/jack/opcodes/const4_16/jm/T_const4_16_10.java $(JACK_PATH)/tests/com/android/jack/opcodes/const4_16/jm/T_const4_16_11.java $(JACK_PATH)/tests/com/android/jack/opcodes/const4_16/jm/T_const4_16_12.java $(JACK_PATH)/tests/com/android/jack/opcodes/const4_16/jm/T_const4_16_13.java $(JACK_PATH)/tests/com/android/jack/opcodes/const4_16/jm/T_const4_16_14.java $(JACK_PATH)/tests/com/android/jack/opcodes/const4_16/jm/T_const4_16_15.java $(JACK_PATH)/tests/com/android/jack/opcodes/const4_16/jm/T_const4_16_16.java $(JACK_PATH)/tests/com/android/jack/opcodes/const4_16/jm/T_const4_16_17.java
+JACKTEST_WITHDX_SRC := tests/com/android/jack/opcodes/const4_16/Test_const4_16.java src/com/android/jack/DxTestCase.java
+JACKTEST_WITHJACK_SRC := tests/com/android/jack/opcodes/const4_16/jm/T_const4_16_1.java tests/com/android/jack/opcodes/const4_16/jm/T_const4_16_2.java tests/com/android/jack/opcodes/const4_16/jm/T_const4_16_3.java tests/com/android/jack/opcodes/const4_16/jm/T_const4_16_4.java tests/com/android/jack/opcodes/const4_16/jm/T_const4_16_5.java tests/com/android/jack/opcodes/const4_16/jm/T_const4_16_6.java tests/com/android/jack/opcodes/const4_16/jm/T_const4_16_7.java tests/com/android/jack/opcodes/const4_16/jm/T_const4_16_8.java tests/com/android/jack/opcodes/const4_16/jm/T_const4_16_9.java tests/com/android/jack/opcodes/const4_16/jm/T_const4_16_10.java tests/com/android/jack/opcodes/const4_16/jm/T_const4_16_11.java tests/com/android/jack/opcodes/const4_16/jm/T_const4_16_12.java tests/com/android/jack/opcodes/const4_16/jm/T_const4_16_13.java tests/com/android/jack/opcodes/const4_16/jm/T_const4_16_14.java tests/com/android/jack/opcodes/const4_16/jm/T_const4_16_15.java tests/com/android/jack/opcodes/const4_16/jm/T_const4_16_16.java tests/com/android/jack/opcodes/const4_16/jm/T_const4_16_17.java
JACKTEST_JUNIT := com.android.jack.opcodes.const4_16.Test_const4_16
include $(JACK_RUN_TEST)
@@ -743,8 +743,8 @@ include $(JACK_RUN_TEST)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := opcode-sub_int
-JACKTEST_WITHDX_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/sub_int/Test_sub_int.java $(JACK_PATH)/src/com/android/jack/DxTestCase.java
-JACKTEST_WITHJACK_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/sub_int/jm/T_sub_int_1.java $(JACK_PATH)/tests/com/android/jack/opcodes/sub_int/jm/T_sub_int_3.java $(JACK_PATH)/tests/com/android/jack/opcodes/sub_int/jm/T_sub_int_4.java
+JACKTEST_WITHDX_SRC := tests/com/android/jack/opcodes/sub_int/Test_sub_int.java src/com/android/jack/DxTestCase.java
+JACKTEST_WITHJACK_SRC := tests/com/android/jack/opcodes/sub_int/jm/T_sub_int_1.java tests/com/android/jack/opcodes/sub_int/jm/T_sub_int_3.java tests/com/android/jack/opcodes/sub_int/jm/T_sub_int_4.java
JACKTEST_JUNIT := com.android.jack.opcodes.sub_int.Test_sub_int
include $(JACK_RUN_TEST)
@@ -754,8 +754,8 @@ include $(JACK_RUN_TEST)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := opcode-neg_long
-JACKTEST_WITHDX_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/neg_long/Test_neg_long.java $(JACK_PATH)/src/com/android/jack/DxTestCase.java
-JACKTEST_WITHJACK_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/neg_long/jm/T_neg_long_1.java $(JACK_PATH)/tests/com/android/jack/opcodes/neg_long/jm/T_neg_long_2.java $(JACK_PATH)/tests/com/android/jack/opcodes/neg_long/jm/T_neg_long_4.java $(JACK_PATH)/tests/com/android/jack/opcodes/neg_long/jm/T_neg_long_5.java $(JACK_PATH)/tests/com/android/jack/opcodes/neg_long/jm/T_neg_long_6.java
+JACKTEST_WITHDX_SRC := tests/com/android/jack/opcodes/neg_long/Test_neg_long.java src/com/android/jack/DxTestCase.java
+JACKTEST_WITHJACK_SRC := tests/com/android/jack/opcodes/neg_long/jm/T_neg_long_1.java tests/com/android/jack/opcodes/neg_long/jm/T_neg_long_2.java tests/com/android/jack/opcodes/neg_long/jm/T_neg_long_4.java tests/com/android/jack/opcodes/neg_long/jm/T_neg_long_5.java tests/com/android/jack/opcodes/neg_long/jm/T_neg_long_6.java
JACKTEST_JUNIT := com.android.jack.opcodes.neg_long.Test_neg_long
include $(JACK_RUN_TEST)
@@ -765,8 +765,8 @@ include $(JACK_RUN_TEST)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := opcode-opc_return
-JACKTEST_WITHDX_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/opc_return/Test_opc_return.java $(JACK_PATH)/src/com/android/jack/DxTestCase.java
-JACKTEST_WITHJACK_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/opc_return/jm/T_opc_return_1.java $(JACK_PATH)/tests/com/android/jack/opcodes/opc_return/jm/T_opc_return_2.java $(JACK_PATH)/tests/com/android/jack/opcodes/opc_return/jm/T_opc_return_3.java $(JACK_PATH)/tests/com/android/jack/opcodes/opc_return/jm/T_opc_return_4.java $(JACK_PATH)/tests/com/android/jack/opcodes/opc_return/jm/T_opc_return_5.java $(JACK_PATH)/tests/com/android/jack/opcodes/opc_return/jm/T_opc_return_6.java $(JACK_PATH)/tests/com/android/jack/opcodes/opc_return/jm/T_opc_return_7.java $(JACK_PATH)/tests/com/android/jack/opcodes/opc_return/jm/T_opc_return_8.java $(JACK_PATH)/tests/com/android/jack/opcodes/opc_return/jm/T_opc_return_9.java $(JACK_PATH)/tests/com/android/jack/opcodes/opc_return/jm/T_opc_return_10.java $(JACK_PATH)/tests/com/android/jack/opcodes/opc_return/jm/T_opc_return_11.java $(JACK_PATH)/tests/com/android/jack/opcodes/opc_return/jm/T_opc_return_12.java $(JACK_PATH)/tests/com/android/jack/opcodes/opc_return/jm/T_opc_return_13.java $(JACK_PATH)/tests/com/android/jack/opcodes/opc_return/jm/T_opc_return_14.java $(JACK_PATH)/tests/com/android/jack/opcodes/opc_return/jm/T_opc_return_15.java
+JACKTEST_WITHDX_SRC := tests/com/android/jack/opcodes/opc_return/Test_opc_return.java src/com/android/jack/DxTestCase.java
+JACKTEST_WITHJACK_SRC := tests/com/android/jack/opcodes/opc_return/jm/T_opc_return_1.java tests/com/android/jack/opcodes/opc_return/jm/T_opc_return_2.java tests/com/android/jack/opcodes/opc_return/jm/T_opc_return_3.java tests/com/android/jack/opcodes/opc_return/jm/T_opc_return_4.java tests/com/android/jack/opcodes/opc_return/jm/T_opc_return_5.java tests/com/android/jack/opcodes/opc_return/jm/T_opc_return_6.java tests/com/android/jack/opcodes/opc_return/jm/T_opc_return_7.java tests/com/android/jack/opcodes/opc_return/jm/T_opc_return_8.java tests/com/android/jack/opcodes/opc_return/jm/T_opc_return_9.java tests/com/android/jack/opcodes/opc_return/jm/T_opc_return_10.java tests/com/android/jack/opcodes/opc_return/jm/T_opc_return_11.java tests/com/android/jack/opcodes/opc_return/jm/T_opc_return_12.java tests/com/android/jack/opcodes/opc_return/jm/T_opc_return_13.java tests/com/android/jack/opcodes/opc_return/jm/T_opc_return_14.java tests/com/android/jack/opcodes/opc_return/jm/T_opc_return_15.java
JACKTEST_JUNIT := com.android.jack.opcodes.opc_return.Test_opc_return
include $(JACK_RUN_TEST)
@@ -776,8 +776,8 @@ include $(JACK_RUN_TEST)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := opcode-long_to_float
-JACKTEST_WITHDX_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/long_to_float/Test_long_to_float.java $(JACK_PATH)/src/com/android/jack/DxTestCase.java
-JACKTEST_WITHJACK_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/long_to_float/jm/T_long_to_float_1.java $(JACK_PATH)/tests/com/android/jack/opcodes/long_to_float/jm/T_long_to_float_3.java $(JACK_PATH)/tests/com/android/jack/opcodes/long_to_float/jm/T_long_to_float_4.java
+JACKTEST_WITHDX_SRC := tests/com/android/jack/opcodes/long_to_float/Test_long_to_float.java src/com/android/jack/DxTestCase.java
+JACKTEST_WITHJACK_SRC := tests/com/android/jack/opcodes/long_to_float/jm/T_long_to_float_1.java tests/com/android/jack/opcodes/long_to_float/jm/T_long_to_float_3.java tests/com/android/jack/opcodes/long_to_float/jm/T_long_to_float_4.java
JACKTEST_JUNIT := com.android.jack.opcodes.long_to_float.Test_long_to_float
include $(JACK_RUN_TEST)
@@ -787,8 +787,8 @@ include $(JACK_RUN_TEST)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := opcode-if_le
-JACKTEST_WITHDX_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/if_le/Test_if_le.java $(JACK_PATH)/src/com/android/jack/DxTestCase.java
-JACKTEST_WITHJACK_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/if_le/jm/T_if_le_1.java $(JACK_PATH)/tests/com/android/jack/opcodes/if_le/jm/T_if_le_2.java
+JACKTEST_WITHDX_SRC := tests/com/android/jack/opcodes/if_le/Test_if_le.java src/com/android/jack/DxTestCase.java
+JACKTEST_WITHJACK_SRC := tests/com/android/jack/opcodes/if_le/jm/T_if_le_1.java tests/com/android/jack/opcodes/if_le/jm/T_if_le_2.java
JACKTEST_JUNIT := com.android.jack.opcodes.if_le.Test_if_le
include $(JACK_RUN_TEST)
@@ -798,8 +798,8 @@ include $(JACK_RUN_TEST)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := opcode-aget_byte
-JACKTEST_WITHDX_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/aget_byte/Test_aget_byte.java $(JACK_PATH)/src/com/android/jack/DxTestCase.java
-JACKTEST_WITHJACK_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/aget_byte/jm/T_aget_byte_1.java
+JACKTEST_WITHDX_SRC := tests/com/android/jack/opcodes/aget_byte/Test_aget_byte.java src/com/android/jack/DxTestCase.java
+JACKTEST_WITHJACK_SRC := tests/com/android/jack/opcodes/aget_byte/jm/T_aget_byte_1.java
JACKTEST_JUNIT := com.android.jack.opcodes.aget_byte.Test_aget_byte
include $(JACK_RUN_TEST)
@@ -809,8 +809,8 @@ include $(JACK_RUN_TEST)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := opcode-iget
-JACKTEST_WITHDX_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/iget/Test_iget.java $(JACK_PATH)/src/com/android/jack/DxTestCase.java
-JACKTEST_WITHJACK_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/iget/jm/TestStubs.java $(JACK_PATH)/tests/com/android/jack/opcodes/iget/jm/T_iget_11.java $(JACK_PATH)/tests/com/android/jack/opcodes/iget/jm/T_iget_15.java $(JACK_PATH)/tests/com/android/jack/opcodes/iget/jm/T_iget_1.java $(JACK_PATH)/tests/com/android/jack/opcodes/iget/jm/T_iget_2.java $(JACK_PATH)/tests/com/android/jack/opcodes/iget/jm/T_iget_4.java $(JACK_PATH)/tests/com/android/jack/opcodes/iget/jm/T_iget_5.java $(JACK_PATH)/tests/com/android/jack/opcodes/iget/jm/T_iget_6.java
+JACKTEST_WITHDX_SRC := tests/com/android/jack/opcodes/iget/Test_iget.java src/com/android/jack/DxTestCase.java
+JACKTEST_WITHJACK_SRC := tests/com/android/jack/opcodes/iget/jm/TestStubs.java tests/com/android/jack/opcodes/iget/jm/T_iget_11.java tests/com/android/jack/opcodes/iget/jm/T_iget_15.java tests/com/android/jack/opcodes/iget/jm/T_iget_1.java tests/com/android/jack/opcodes/iget/jm/T_iget_2.java tests/com/android/jack/opcodes/iget/jm/T_iget_4.java tests/com/android/jack/opcodes/iget/jm/T_iget_5.java tests/com/android/jack/opcodes/iget/jm/T_iget_6.java
JACKTEST_JUNIT := com.android.jack.opcodes.iget.Test_iget
include $(JACK_RUN_TEST)
@@ -820,8 +820,8 @@ include $(JACK_RUN_TEST)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := opcode-aput_char
-JACKTEST_WITHDX_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/aput_char/Test_aput_char.java $(JACK_PATH)/src/com/android/jack/DxTestCase.java
-JACKTEST_WITHJACK_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/aput_char/jm/T_aput_char_1.java $(JACK_PATH)/tests/com/android/jack/opcodes/aput_char/jm/T_aput_char_4.java $(JACK_PATH)/tests/com/android/jack/opcodes/aput_char/jm/T_aput_char_5.java
+JACKTEST_WITHDX_SRC := tests/com/android/jack/opcodes/aput_char/Test_aput_char.java src/com/android/jack/DxTestCase.java
+JACKTEST_WITHJACK_SRC := tests/com/android/jack/opcodes/aput_char/jm/T_aput_char_1.java tests/com/android/jack/opcodes/aput_char/jm/T_aput_char_4.java tests/com/android/jack/opcodes/aput_char/jm/T_aput_char_5.java
JACKTEST_JUNIT := com.android.jack.opcodes.aput_char.Test_aput_char
include $(JACK_RUN_TEST)
@@ -831,8 +831,8 @@ include $(JACK_RUN_TEST)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := opcode-div_float
-JACKTEST_WITHDX_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/div_float/Test_div_float.java $(JACK_PATH)/src/com/android/jack/DxTestCase.java
-JACKTEST_WITHJACK_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/div_float/jm/T_div_float_1.java $(JACK_PATH)/tests/com/android/jack/opcodes/div_float/jm/T_div_float_3.java $(JACK_PATH)/tests/com/android/jack/opcodes/div_float/jm/T_div_float_4.java
+JACKTEST_WITHDX_SRC := tests/com/android/jack/opcodes/div_float/Test_div_float.java src/com/android/jack/DxTestCase.java
+JACKTEST_WITHJACK_SRC := tests/com/android/jack/opcodes/div_float/jm/T_div_float_1.java tests/com/android/jack/opcodes/div_float/jm/T_div_float_3.java tests/com/android/jack/opcodes/div_float/jm/T_div_float_4.java
JACKTEST_JUNIT := com.android.jack.opcodes.div_float.Test_div_float
include $(JACK_RUN_TEST)
@@ -842,8 +842,8 @@ include $(JACK_RUN_TEST)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := opcode-if_nez
-JACKTEST_WITHDX_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/if_nez/Test_if_nez.java $(JACK_PATH)/src/com/android/jack/DxTestCase.java
-JACKTEST_WITHJACK_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/if_nez/jm/T_if_nez_1.java $(JACK_PATH)/tests/com/android/jack/opcodes/if_nez/jm/T_if_nez_2.java $(JACK_PATH)/tests/com/android/jack/opcodes/if_nez/jm/T_if_nez_3.java $(JACK_PATH)/tests/com/android/jack/opcodes/if_nez/jm/T_if_nez_4.java
+JACKTEST_WITHDX_SRC := tests/com/android/jack/opcodes/if_nez/Test_if_nez.java src/com/android/jack/DxTestCase.java
+JACKTEST_WITHJACK_SRC := tests/com/android/jack/opcodes/if_nez/jm/T_if_nez_1.java tests/com/android/jack/opcodes/if_nez/jm/T_if_nez_2.java tests/com/android/jack/opcodes/if_nez/jm/T_if_nez_3.java tests/com/android/jack/opcodes/if_nez/jm/T_if_nez_4.java
JACKTEST_JUNIT := com.android.jack.opcodes.if_nez.Test_if_nez
include $(JACK_RUN_TEST)
@@ -853,8 +853,8 @@ include $(JACK_RUN_TEST)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := opcode-div_int
-JACKTEST_WITHDX_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/div_int/Test_div_int.java $(JACK_PATH)/src/com/android/jack/DxTestCase.java
-JACKTEST_WITHJACK_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/div_int/jm/T_div_int_1.java $(JACK_PATH)/tests/com/android/jack/opcodes/div_int/jm/T_div_int_3.java $(JACK_PATH)/tests/com/android/jack/opcodes/div_int/jm/T_div_int_4.java
+JACKTEST_WITHDX_SRC := tests/com/android/jack/opcodes/div_int/Test_div_int.java src/com/android/jack/DxTestCase.java
+JACKTEST_WITHJACK_SRC := tests/com/android/jack/opcodes/div_int/jm/T_div_int_1.java tests/com/android/jack/opcodes/div_int/jm/T_div_int_3.java tests/com/android/jack/opcodes/div_int/jm/T_div_int_4.java
JACKTEST_JUNIT := com.android.jack.opcodes.div_int.Test_div_int
include $(JACK_RUN_TEST)
@@ -864,8 +864,8 @@ include $(JACK_RUN_TEST)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := opcode-float_to_int
-JACKTEST_WITHDX_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/float_to_int/Test_float_to_int.java $(JACK_PATH)/src/com/android/jack/DxTestCase.java
-JACKTEST_WITHJACK_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/float_to_int/jm/T_float_to_int_1.java $(JACK_PATH)/tests/com/android/jack/opcodes/float_to_int/jm/T_float_to_int_3.java $(JACK_PATH)/tests/com/android/jack/opcodes/float_to_int/jm/T_float_to_int_4.java
+JACKTEST_WITHDX_SRC := tests/com/android/jack/opcodes/float_to_int/Test_float_to_int.java src/com/android/jack/DxTestCase.java
+JACKTEST_WITHJACK_SRC := tests/com/android/jack/opcodes/float_to_int/jm/T_float_to_int_1.java tests/com/android/jack/opcodes/float_to_int/jm/T_float_to_int_3.java tests/com/android/jack/opcodes/float_to_int/jm/T_float_to_int_4.java
JACKTEST_JUNIT := com.android.jack.opcodes.float_to_int.Test_float_to_int
include $(JACK_RUN_TEST)
@@ -875,8 +875,8 @@ include $(JACK_RUN_TEST)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := opcode-long_to_int
-JACKTEST_WITHDX_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/long_to_int/Test_long_to_int.java $(JACK_PATH)/src/com/android/jack/DxTestCase.java
-JACKTEST_WITHJACK_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/long_to_int/jm/T_long_to_int_1.java $(JACK_PATH)/tests/com/android/jack/opcodes/long_to_int/jm/T_long_to_int_3.java $(JACK_PATH)/tests/com/android/jack/opcodes/long_to_int/jm/T_long_to_int_4.java
+JACKTEST_WITHDX_SRC := tests/com/android/jack/opcodes/long_to_int/Test_long_to_int.java src/com/android/jack/DxTestCase.java
+JACKTEST_WITHJACK_SRC := tests/com/android/jack/opcodes/long_to_int/jm/T_long_to_int_1.java tests/com/android/jack/opcodes/long_to_int/jm/T_long_to_int_3.java tests/com/android/jack/opcodes/long_to_int/jm/T_long_to_int_4.java
JACKTEST_JUNIT := com.android.jack.opcodes.long_to_int.Test_long_to_int
include $(JACK_RUN_TEST)
@@ -886,8 +886,8 @@ include $(JACK_RUN_TEST)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := opcode-cmpl_float
-JACKTEST_WITHDX_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/cmpl_float/Test_cmpl_float.java $(JACK_PATH)/src/com/android/jack/DxTestCase.java
-JACKTEST_WITHJACK_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/cmpl_float/jm/T_cmpl_float_1.java $(JACK_PATH)/tests/com/android/jack/opcodes/cmpl_float/jm/T_cmpl_float_2.java
+JACKTEST_WITHDX_SRC := tests/com/android/jack/opcodes/cmpl_float/Test_cmpl_float.java src/com/android/jack/DxTestCase.java
+JACKTEST_WITHJACK_SRC := tests/com/android/jack/opcodes/cmpl_float/jm/T_cmpl_float_1.java tests/com/android/jack/opcodes/cmpl_float/jm/T_cmpl_float_2.java
JACKTEST_JUNIT := com.android.jack.opcodes.cmpl_float.Test_cmpl_float
include $(JACK_RUN_TEST)
@@ -897,8 +897,8 @@ include $(JACK_RUN_TEST)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := opcode-shr_int
-JACKTEST_WITHDX_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/shr_int/Test_shr_int.java $(JACK_PATH)/src/com/android/jack/DxTestCase.java
-JACKTEST_WITHJACK_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/shr_int/jm/T_shr_int_1.java $(JACK_PATH)/tests/com/android/jack/opcodes/shr_int/jm/T_shr_int_3.java $(JACK_PATH)/tests/com/android/jack/opcodes/shr_int/jm/T_shr_int_4.java
+JACKTEST_WITHDX_SRC := tests/com/android/jack/opcodes/shr_int/Test_shr_int.java src/com/android/jack/DxTestCase.java
+JACKTEST_WITHJACK_SRC := tests/com/android/jack/opcodes/shr_int/jm/T_shr_int_1.java tests/com/android/jack/opcodes/shr_int/jm/T_shr_int_3.java tests/com/android/jack/opcodes/shr_int/jm/T_shr_int_4.java
JACKTEST_JUNIT := com.android.jack.opcodes.shr_int.Test_shr_int
include $(JACK_RUN_TEST)
@@ -908,8 +908,8 @@ include $(JACK_RUN_TEST)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := opcode-if_eq
-JACKTEST_WITHDX_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/if_eq/Test_if_eq.java $(JACK_PATH)/src/com/android/jack/DxTestCase.java
-JACKTEST_WITHJACK_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/if_eq/jm/T_if_eq_1.java $(JACK_PATH)/tests/com/android/jack/opcodes/if_eq/jm/T_if_eq_2.java $(JACK_PATH)/tests/com/android/jack/opcodes/if_eq/jm/T_if_eq_3.java
+JACKTEST_WITHDX_SRC := tests/com/android/jack/opcodes/if_eq/Test_if_eq.java src/com/android/jack/DxTestCase.java
+JACKTEST_WITHJACK_SRC := tests/com/android/jack/opcodes/if_eq/jm/T_if_eq_1.java tests/com/android/jack/opcodes/if_eq/jm/T_if_eq_2.java tests/com/android/jack/opcodes/if_eq/jm/T_if_eq_3.java
JACKTEST_JUNIT := com.android.jack.opcodes.if_eq.Test_if_eq
include $(JACK_RUN_TEST)
@@ -919,8 +919,8 @@ include $(JACK_RUN_TEST)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := opcode-add_int
-JACKTEST_WITHDX_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/add_int/Test_add_int.java $(JACK_PATH)/src/com/android/jack/DxTestCase.java
-JACKTEST_WITHJACK_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/add_int/jm/T_add_int_1.java $(JACK_PATH)/tests/com/android/jack/opcodes/add_int/jm/T_add_int_3.java $(JACK_PATH)/tests/com/android/jack/opcodes/add_int/jm/T_add_int_4.java $(JACK_PATH)/tests/com/android/jack/opcodes/add_int/jm/T_add_int_5.java $(JACK_PATH)/tests/com/android/jack/opcodes/add_int/jm/T_add_int_6.java $(JACK_PATH)/tests/com/android/jack/opcodes/add_int/jm/T_add_int_7.java $(JACK_PATH)/tests/com/android/jack/opcodes/add_int/jm/T_add_int_8.java $(JACK_PATH)/tests/com/android/jack/opcodes/add_int/jm/T_add_int_9.java $(JACK_PATH)/tests/com/android/jack/opcodes/add_int/jm/T_add_int_10.java
+JACKTEST_WITHDX_SRC := tests/com/android/jack/opcodes/add_int/Test_add_int.java src/com/android/jack/DxTestCase.java
+JACKTEST_WITHJACK_SRC := tests/com/android/jack/opcodes/add_int/jm/T_add_int_1.java tests/com/android/jack/opcodes/add_int/jm/T_add_int_3.java tests/com/android/jack/opcodes/add_int/jm/T_add_int_4.java tests/com/android/jack/opcodes/add_int/jm/T_add_int_5.java tests/com/android/jack/opcodes/add_int/jm/T_add_int_6.java tests/com/android/jack/opcodes/add_int/jm/T_add_int_7.java tests/com/android/jack/opcodes/add_int/jm/T_add_int_8.java tests/com/android/jack/opcodes/add_int/jm/T_add_int_9.java tests/com/android/jack/opcodes/add_int/jm/T_add_int_10.java
JACKTEST_JUNIT := com.android.jack.opcodes.add_int.Test_add_int
include $(JACK_RUN_TEST)
@@ -930,8 +930,8 @@ include $(JACK_RUN_TEST)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := opcode-or_long
-JACKTEST_WITHDX_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/or_long/Test_or_long.java $(JACK_PATH)/src/com/android/jack/DxTestCase.java
-JACKTEST_WITHJACK_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/or_long/jm/T_or_long_1.java $(JACK_PATH)/tests/com/android/jack/opcodes/or_long/jm/T_or_long_3.java $(JACK_PATH)/tests/com/android/jack/opcodes/or_long/jm/T_or_long_4.java $(JACK_PATH)/tests/com/android/jack/opcodes/or_long/jm/T_or_long_5.java
+JACKTEST_WITHDX_SRC := tests/com/android/jack/opcodes/or_long/Test_or_long.java src/com/android/jack/DxTestCase.java
+JACKTEST_WITHJACK_SRC := tests/com/android/jack/opcodes/or_long/jm/T_or_long_1.java tests/com/android/jack/opcodes/or_long/jm/T_or_long_3.java tests/com/android/jack/opcodes/or_long/jm/T_or_long_4.java tests/com/android/jack/opcodes/or_long/jm/T_or_long_5.java
JACKTEST_JUNIT := com.android.jack.opcodes.or_long.Test_or_long
include $(JACK_RUN_TEST)
@@ -941,8 +941,8 @@ include $(JACK_RUN_TEST)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := opcode-mul_long
-JACKTEST_WITHDX_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/mul_long/Test_mul_long.java $(JACK_PATH)/src/com/android/jack/DxTestCase.java
-JACKTEST_WITHJACK_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/mul_long/jm/T_mul_long_1.java $(JACK_PATH)/tests/com/android/jack/opcodes/mul_long/jm/T_mul_long_4.java $(JACK_PATH)/tests/com/android/jack/opcodes/mul_long/jm/T_mul_long_5.java $(JACK_PATH)/tests/com/android/jack/opcodes/mul_long/jm/T_mul_long_6.java
+JACKTEST_WITHDX_SRC := tests/com/android/jack/opcodes/mul_long/Test_mul_long.java src/com/android/jack/DxTestCase.java
+JACKTEST_WITHJACK_SRC := tests/com/android/jack/opcodes/mul_long/jm/T_mul_long_1.java tests/com/android/jack/opcodes/mul_long/jm/T_mul_long_4.java tests/com/android/jack/opcodes/mul_long/jm/T_mul_long_5.java tests/com/android/jack/opcodes/mul_long/jm/T_mul_long_6.java
JACKTEST_JUNIT := com.android.jack.opcodes.mul_long.Test_mul_long
include $(JACK_RUN_TEST)
@@ -952,8 +952,8 @@ include $(JACK_RUN_TEST)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := opcode-if_lez
-JACKTEST_WITHDX_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/if_lez/Test_if_lez.java $(JACK_PATH)/src/com/android/jack/DxTestCase.java
-JACKTEST_WITHJACK_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/if_lez/jm/T_if_lez_1.java $(JACK_PATH)/tests/com/android/jack/opcodes/if_lez/jm/T_if_lez_2.java
+JACKTEST_WITHDX_SRC := tests/com/android/jack/opcodes/if_lez/Test_if_lez.java src/com/android/jack/DxTestCase.java
+JACKTEST_WITHJACK_SRC := tests/com/android/jack/opcodes/if_lez/jm/T_if_lez_1.java tests/com/android/jack/opcodes/if_lez/jm/T_if_lez_2.java
JACKTEST_JUNIT := com.android.jack.opcodes.if_lez.Test_if_lez
include $(JACK_RUN_TEST)
@@ -963,8 +963,8 @@ include $(JACK_RUN_TEST)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := opcode-sub_float
-JACKTEST_WITHDX_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/sub_float/Test_sub_float.java $(JACK_PATH)/src/com/android/jack/DxTestCase.java
-JACKTEST_WITHJACK_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/sub_float/jm/T_sub_float_1.java $(JACK_PATH)/tests/com/android/jack/opcodes/sub_float/jm/T_sub_float_3.java $(JACK_PATH)/tests/com/android/jack/opcodes/sub_float/jm/T_sub_float_4.java
+JACKTEST_WITHDX_SRC := tests/com/android/jack/opcodes/sub_float/Test_sub_float.java src/com/android/jack/DxTestCase.java
+JACKTEST_WITHJACK_SRC := tests/com/android/jack/opcodes/sub_float/jm/T_sub_float_1.java tests/com/android/jack/opcodes/sub_float/jm/T_sub_float_3.java tests/com/android/jack/opcodes/sub_float/jm/T_sub_float_4.java
JACKTEST_JUNIT := com.android.jack.opcodes.sub_float.Test_sub_float
include $(JACK_RUN_TEST)
@@ -974,8 +974,8 @@ include $(JACK_RUN_TEST)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := opcode-rem_double
-JACKTEST_WITHDX_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/rem_double/Test_rem_double.java $(JACK_PATH)/src/com/android/jack/DxTestCase.java
-JACKTEST_WITHJACK_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/rem_double/jm/T_rem_double_1.java $(JACK_PATH)/tests/com/android/jack/opcodes/rem_double/jm/T_rem_double_3.java $(JACK_PATH)/tests/com/android/jack/opcodes/rem_double/jm/T_rem_double_4.java
+JACKTEST_WITHDX_SRC := tests/com/android/jack/opcodes/rem_double/Test_rem_double.java src/com/android/jack/DxTestCase.java
+JACKTEST_WITHJACK_SRC := tests/com/android/jack/opcodes/rem_double/jm/T_rem_double_1.java tests/com/android/jack/opcodes/rem_double/jm/T_rem_double_3.java tests/com/android/jack/opcodes/rem_double/jm/T_rem_double_4.java
JACKTEST_JUNIT := com.android.jack.opcodes.rem_double.Test_rem_double
include $(JACK_RUN_TEST)
@@ -985,8 +985,8 @@ include $(JACK_RUN_TEST)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := opcode-neg_int
-JACKTEST_WITHDX_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/neg_int/Test_neg_int.java $(JACK_PATH)/src/com/android/jack/DxTestCase.java
-JACKTEST_WITHJACK_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/neg_int/jm/T_neg_int_1.java $(JACK_PATH)/tests/com/android/jack/opcodes/neg_int/jm/T_neg_int_2.java
+JACKTEST_WITHDX_SRC := tests/com/android/jack/opcodes/neg_int/Test_neg_int.java src/com/android/jack/DxTestCase.java
+JACKTEST_WITHJACK_SRC := tests/com/android/jack/opcodes/neg_int/jm/T_neg_int_1.java tests/com/android/jack/opcodes/neg_int/jm/T_neg_int_2.java
JACKTEST_JUNIT := com.android.jack.opcodes.neg_int.Test_neg_int
include $(JACK_RUN_TEST)
@@ -996,8 +996,8 @@ include $(JACK_RUN_TEST)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := opcode-aput_wide
-JACKTEST_WITHDX_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/aput_wide/Test_aput_wide.java $(JACK_PATH)/src/com/android/jack/DxTestCase.java
-JACKTEST_WITHJACK_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/aput_wide/jm/T_aput_wide_1.java $(JACK_PATH)/tests/com/android/jack/opcodes/aput_wide/jm/T_aput_wide_2.java $(JACK_PATH)/tests/com/android/jack/opcodes/aput_wide/jm/T_aput_wide_3.java $(JACK_PATH)/tests/com/android/jack/opcodes/aput_wide/jm/T_aput_wide_4.java
+JACKTEST_WITHDX_SRC := tests/com/android/jack/opcodes/aput_wide/Test_aput_wide.java src/com/android/jack/DxTestCase.java
+JACKTEST_WITHJACK_SRC := tests/com/android/jack/opcodes/aput_wide/jm/T_aput_wide_1.java tests/com/android/jack/opcodes/aput_wide/jm/T_aput_wide_2.java tests/com/android/jack/opcodes/aput_wide/jm/T_aput_wide_3.java tests/com/android/jack/opcodes/aput_wide/jm/T_aput_wide_4.java
JACKTEST_JUNIT := com.android.jack.opcodes.aput_wide.Test_aput_wide
include $(JACK_RUN_TEST)
@@ -1007,8 +1007,8 @@ include $(JACK_RUN_TEST)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := opcode-div_long
-JACKTEST_WITHDX_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/div_long/Test_div_long.java $(JACK_PATH)/src/com/android/jack/DxTestCase.java
-JACKTEST_WITHJACK_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/div_long/jm/T_div_long_1.java $(JACK_PATH)/tests/com/android/jack/opcodes/div_long/jm/T_div_long_4.java $(JACK_PATH)/tests/com/android/jack/opcodes/div_long/jm/T_div_long_5.java $(JACK_PATH)/tests/com/android/jack/opcodes/div_long/jm/T_div_long_6.java
+JACKTEST_WITHDX_SRC := tests/com/android/jack/opcodes/div_long/Test_div_long.java src/com/android/jack/DxTestCase.java
+JACKTEST_WITHJACK_SRC := tests/com/android/jack/opcodes/div_long/jm/T_div_long_1.java tests/com/android/jack/opcodes/div_long/jm/T_div_long_4.java tests/com/android/jack/opcodes/div_long/jm/T_div_long_5.java tests/com/android/jack/opcodes/div_long/jm/T_div_long_6.java
JACKTEST_JUNIT := com.android.jack.opcodes.div_long.Test_div_long
include $(JACK_RUN_TEST)
@@ -1018,8 +1018,8 @@ include $(JACK_RUN_TEST)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := opcode-xor_int
-JACKTEST_WITHDX_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/xor_int/Test_xor_int.java $(JACK_PATH)/src/com/android/jack/DxTestCase.java
-JACKTEST_WITHJACK_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/xor_int/jm/T_xor_int_1.java $(JACK_PATH)/tests/com/android/jack/opcodes/xor_int/jm/T_xor_int_3.java $(JACK_PATH)/tests/com/android/jack/opcodes/xor_int/jm/T_xor_int_4.java
+JACKTEST_WITHDX_SRC := tests/com/android/jack/opcodes/xor_int/Test_xor_int.java src/com/android/jack/DxTestCase.java
+JACKTEST_WITHJACK_SRC := tests/com/android/jack/opcodes/xor_int/jm/T_xor_int_1.java tests/com/android/jack/opcodes/xor_int/jm/T_xor_int_3.java tests/com/android/jack/opcodes/xor_int/jm/T_xor_int_4.java
JACKTEST_JUNIT := com.android.jack.opcodes.xor_int.Test_xor_int
include $(JACK_RUN_TEST)
@@ -1029,8 +1029,8 @@ include $(JACK_RUN_TEST)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := opcode-aput_object
-JACKTEST_WITHDX_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/aput_object/Test_aput_object.java $(JACK_PATH)/src/com/android/jack/DxTestCase.java
-JACKTEST_WITHJACK_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/aput_object/jm/T_aput_object_10.java $(JACK_PATH)/tests/com/android/jack/opcodes/aput_object/jm/T_aput_object_1.java
+JACKTEST_WITHDX_SRC := tests/com/android/jack/opcodes/aput_object/Test_aput_object.java src/com/android/jack/DxTestCase.java
+JACKTEST_WITHJACK_SRC := tests/com/android/jack/opcodes/aput_object/jm/T_aput_object_10.java tests/com/android/jack/opcodes/aput_object/jm/T_aput_object_1.java
JACKTEST_JUNIT := com.android.jack.opcodes.aput_object.Test_aput_object
include $(JACK_RUN_TEST)
@@ -1040,8 +1040,8 @@ include $(JACK_RUN_TEST)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := opcode-new_array
-JACKTEST_WITHDX_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/new_array/Test_new_array.java $(JACK_PATH)/src/com/android/jack/DxTestCase.java
-JACKTEST_WITHJACK_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/new_array/jm/T_new_array_1.java $(JACK_PATH)/tests/com/android/jack/opcodes/new_array/jm/T_new_array_2.java $(JACK_PATH)/tests/com/android/jack/opcodes/new_array/jm/T_new_array_3.java $(JACK_PATH)/tests/com/android/jack/opcodes/new_array/jm/T_new_array_4.java $(JACK_PATH)/tests/com/android/jack/opcodes/new_array/jm/T_new_array_5.java $(JACK_PATH)/tests/com/android/jack/opcodes/new_array/jm/T_new_array_6.java
+JACKTEST_WITHDX_SRC := tests/com/android/jack/opcodes/new_array/Test_new_array.java src/com/android/jack/DxTestCase.java
+JACKTEST_WITHJACK_SRC := tests/com/android/jack/opcodes/new_array/jm/T_new_array_1.java tests/com/android/jack/opcodes/new_array/jm/T_new_array_2.java tests/com/android/jack/opcodes/new_array/jm/T_new_array_3.java tests/com/android/jack/opcodes/new_array/jm/T_new_array_4.java tests/com/android/jack/opcodes/new_array/jm/T_new_array_5.java tests/com/android/jack/opcodes/new_array/jm/T_new_array_6.java
JACKTEST_JUNIT := com.android.jack.opcodes.new_array.Test_new_array
include $(JACK_RUN_TEST)
@@ -1051,8 +1051,8 @@ include $(JACK_RUN_TEST)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := opcode-aput_short
-JACKTEST_WITHDX_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/aput_short/Test_aput_short.java $(JACK_PATH)/src/com/android/jack/DxTestCase.java
-JACKTEST_WITHJACK_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/aput_short/jm/T_aput_short_1.java $(JACK_PATH)/tests/com/android/jack/opcodes/aput_short/jm/T_aput_short_4.java $(JACK_PATH)/tests/com/android/jack/opcodes/aput_short/jm/T_aput_short_5.java
+JACKTEST_WITHDX_SRC := tests/com/android/jack/opcodes/aput_short/Test_aput_short.java src/com/android/jack/DxTestCase.java
+JACKTEST_WITHJACK_SRC := tests/com/android/jack/opcodes/aput_short/jm/T_aput_short_1.java tests/com/android/jack/opcodes/aput_short/jm/T_aput_short_4.java tests/com/android/jack/opcodes/aput_short/jm/T_aput_short_5.java
JACKTEST_JUNIT := com.android.jack.opcodes.aput_short.Test_aput_short
include $(JACK_RUN_TEST)
@@ -1063,8 +1063,8 @@ include $(JACK_RUN_TEST)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := opcode-if_ne
-JACKTEST_WITHDX_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/if_ne/Test_if_ne.java $(JACK_PATH)/src/com/android/jack/DxTestCase.java
-JACKTEST_WITHJACK_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/if_ne/jm/T_if_ne_1.java $(JACK_PATH)/tests/com/android/jack/opcodes/if_ne/jm/T_if_ne_2.java
+JACKTEST_WITHDX_SRC := tests/com/android/jack/opcodes/if_ne/Test_if_ne.java src/com/android/jack/DxTestCase.java
+JACKTEST_WITHJACK_SRC := tests/com/android/jack/opcodes/if_ne/jm/T_if_ne_1.java tests/com/android/jack/opcodes/if_ne/jm/T_if_ne_2.java
JACKTEST_JUNIT := com.android.jack.opcodes.if_ne.Test_if_ne
include $(JACK_RUN_TEST)
@@ -1074,8 +1074,8 @@ include $(JACK_RUN_TEST)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := opcode-rem_float
-JACKTEST_WITHDX_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/rem_float/Test_rem_float.java $(JACK_PATH)/src/com/android/jack/DxTestCase.java
-JACKTEST_WITHJACK_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/rem_float/jm/T_rem_float_1.java $(JACK_PATH)/tests/com/android/jack/opcodes/rem_float/jm/T_rem_float_3.java $(JACK_PATH)/tests/com/android/jack/opcodes/rem_float/jm/T_rem_float_4.java
+JACKTEST_WITHDX_SRC := tests/com/android/jack/opcodes/rem_float/Test_rem_float.java src/com/android/jack/DxTestCase.java
+JACKTEST_WITHJACK_SRC := tests/com/android/jack/opcodes/rem_float/jm/T_rem_float_1.java tests/com/android/jack/opcodes/rem_float/jm/T_rem_float_3.java tests/com/android/jack/opcodes/rem_float/jm/T_rem_float_4.java
JACKTEST_JUNIT := com.android.jack.opcodes.rem_float.Test_rem_float
include $(JACK_RUN_TEST)
@@ -1085,8 +1085,8 @@ include $(JACK_RUN_TEST)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := opcode-ushr_int
-JACKTEST_WITHDX_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/ushr_int/Test_ushr_int.java $(JACK_PATH)/src/com/android/jack/DxTestCase.java
-JACKTEST_WITHJACK_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/ushr_int/jm/T_ushr_int_1.java $(JACK_PATH)/tests/com/android/jack/opcodes/ushr_int/jm/T_ushr_int_3.java $(JACK_PATH)/tests/com/android/jack/opcodes/ushr_int/jm/T_ushr_int_4.java
+JACKTEST_WITHDX_SRC := tests/com/android/jack/opcodes/ushr_int/Test_ushr_int.java src/com/android/jack/DxTestCase.java
+JACKTEST_WITHJACK_SRC := tests/com/android/jack/opcodes/ushr_int/jm/T_ushr_int_1.java tests/com/android/jack/opcodes/ushr_int/jm/T_ushr_int_3.java tests/com/android/jack/opcodes/ushr_int/jm/T_ushr_int_4.java
JACKTEST_JUNIT := com.android.jack.opcodes.ushr_int.Test_ushr_int
include $(JACK_RUN_TEST)
@@ -1096,8 +1096,8 @@ include $(JACK_RUN_TEST)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := opcode-invoke_interface
-JACKTEST_WITHDX_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/invoke_interface/Test_invoke_interface.java $(JACK_PATH)/src/com/android/jack/DxTestCase.java
-JACKTEST_WITHJACK_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/invoke_interface/jm/ITestImplAbstract.java $(JACK_PATH)/tests/com/android/jack/opcodes/invoke_interface/jm/ITestImpl.java $(JACK_PATH)/tests/com/android/jack/opcodes/invoke_interface/jm/ITest.java $(JACK_PATH)/tests/com/android/jack/opcodes/invoke_interface/jm/T_invoke_interface_12.java $(JACK_PATH)/tests/com/android/jack/opcodes/invoke_interface/jm/T_invoke_interface_14.java $(JACK_PATH)/tests/com/android/jack/opcodes/invoke_interface/jm/T_invoke_interface_17.java $(JACK_PATH)/tests/com/android/jack/opcodes/invoke_interface/jm/T_invoke_interface_19.java $(JACK_PATH)/tests/com/android/jack/opcodes/invoke_interface/jm/T_invoke_interface_1.java $(JACK_PATH)/tests/com/android/jack/opcodes/invoke_interface/jm/T_invoke_interface_23.java $(JACK_PATH)/tests/com/android/jack/opcodes/invoke_interface/jm/T_invoke_interface_2.java
+JACKTEST_WITHDX_SRC := tests/com/android/jack/opcodes/invoke_interface/Test_invoke_interface.java src/com/android/jack/DxTestCase.java
+JACKTEST_WITHJACK_SRC := tests/com/android/jack/opcodes/invoke_interface/jm/ITestImplAbstract.java tests/com/android/jack/opcodes/invoke_interface/jm/ITestImpl.java tests/com/android/jack/opcodes/invoke_interface/jm/ITest.java tests/com/android/jack/opcodes/invoke_interface/jm/T_invoke_interface_12.java tests/com/android/jack/opcodes/invoke_interface/jm/T_invoke_interface_14.java tests/com/android/jack/opcodes/invoke_interface/jm/T_invoke_interface_17.java tests/com/android/jack/opcodes/invoke_interface/jm/T_invoke_interface_19.java tests/com/android/jack/opcodes/invoke_interface/jm/T_invoke_interface_1.java tests/com/android/jack/opcodes/invoke_interface/jm/T_invoke_interface_23.java tests/com/android/jack/opcodes/invoke_interface/jm/T_invoke_interface_2.java
JACKTEST_JUNIT := com.android.jack.opcodes.invoke_interface.Test_invoke_interface
include $(JACK_RUN_TEST)
@@ -1107,8 +1107,8 @@ include $(JACK_RUN_TEST)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := opcode-mul_float
-JACKTEST_WITHDX_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/mul_float/Test_mul_float.java $(JACK_PATH)/src/com/android/jack/DxTestCase.java
-JACKTEST_WITHJACK_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/mul_float/jm/T_mul_float_1.java $(JACK_PATH)/tests/com/android/jack/opcodes/mul_float/jm/T_mul_float_3.java $(JACK_PATH)/tests/com/android/jack/opcodes/mul_float/jm/T_mul_float_4.java
+JACKTEST_WITHDX_SRC := tests/com/android/jack/opcodes/mul_float/Test_mul_float.java src/com/android/jack/DxTestCase.java
+JACKTEST_WITHJACK_SRC := tests/com/android/jack/opcodes/mul_float/jm/T_mul_float_1.java tests/com/android/jack/opcodes/mul_float/jm/T_mul_float_3.java tests/com/android/jack/opcodes/mul_float/jm/T_mul_float_4.java
JACKTEST_JUNIT := com.android.jack.opcodes.mul_float.Test_mul_float
include $(JACK_RUN_TEST)
@@ -1118,8 +1118,8 @@ include $(JACK_RUN_TEST)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := opcode-if_gt
-JACKTEST_WITHDX_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/if_gt/Test_if_gt.java $(JACK_PATH)/src/com/android/jack/DxTestCase.java
-JACKTEST_WITHJACK_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/if_gt/jm/T_if_gt_1.java $(JACK_PATH)/tests/com/android/jack/opcodes/if_gt/jm/T_if_gt_2.java
+JACKTEST_WITHDX_SRC := tests/com/android/jack/opcodes/if_gt/Test_if_gt.java src/com/android/jack/DxTestCase.java
+JACKTEST_WITHJACK_SRC := tests/com/android/jack/opcodes/if_gt/jm/T_if_gt_1.java tests/com/android/jack/opcodes/if_gt/jm/T_if_gt_2.java
JACKTEST_JUNIT := com.android.jack.opcodes.if_gt.Test_if_gt
include $(JACK_RUN_TEST)
@@ -1129,8 +1129,8 @@ include $(JACK_RUN_TEST)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := opcode-packed_switch
-JACKTEST_WITHDX_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/packed_switch/Test_packed_switch.java $(JACK_PATH)/src/com/android/jack/DxTestCase.java
-JACKTEST_WITHJACK_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/packed_switch/jm/T_packed_switch_1.java
+JACKTEST_WITHDX_SRC := tests/com/android/jack/opcodes/packed_switch/Test_packed_switch.java src/com/android/jack/DxTestCase.java
+JACKTEST_WITHJACK_SRC := tests/com/android/jack/opcodes/packed_switch/jm/T_packed_switch_1.java
JACKTEST_JUNIT := com.android.jack.opcodes.packed_switch.Test_packed_switch
include $(JACK_RUN_TEST)
@@ -1140,8 +1140,8 @@ include $(JACK_RUN_TEST)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := opcode-const_string
-JACKTEST_WITHDX_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/const_string/Test_const_string.java $(JACK_PATH)/src/com/android/jack/DxTestCase.java
-JACKTEST_WITHJACK_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/const_string/jm/T_const_string_1.java
+JACKTEST_WITHDX_SRC := tests/com/android/jack/opcodes/const_string/Test_const_string.java src/com/android/jack/DxTestCase.java
+JACKTEST_WITHJACK_SRC := tests/com/android/jack/opcodes/const_string/jm/T_const_string_1.java
JACKTEST_JUNIT := com.android.jack.opcodes.const_string.Test_const_string
include $(JACK_RUN_TEST)
@@ -1151,8 +1151,8 @@ include $(JACK_RUN_TEST)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := opcode-opc_const
-JACKTEST_WITHDX_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/opc_const/Test_opc_const.java $(JACK_PATH)/src/com/android/jack/DxTestCase.java
-JACKTEST_WITHJACK_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/opc_const/jm/T_opc_const_1.java $(JACK_PATH)/tests/com/android/jack/opcodes/opc_const/jm/T_opc_const_2.java
+JACKTEST_WITHDX_SRC := tests/com/android/jack/opcodes/opc_const/Test_opc_const.java src/com/android/jack/DxTestCase.java
+JACKTEST_WITHJACK_SRC := tests/com/android/jack/opcodes/opc_const/jm/T_opc_const_1.java tests/com/android/jack/opcodes/opc_const/jm/T_opc_const_2.java
JACKTEST_JUNIT := com.android.jack.opcodes.opc_const.Test_opc_const
include $(JACK_RUN_TEST)
@@ -1162,8 +1162,8 @@ include $(JACK_RUN_TEST)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := opcode-invoke_super
-JACKTEST_WITHDX_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/invoke_super/Test_invoke_super.java $(JACK_PATH)/src/com/android/jack/DxTestCase.java
-JACKTEST_WITHJACK_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/invoke_super/jm/T_invoke_super_1.java $(JACK_PATH)/tests/com/android/jack/opcodes/invoke_super/jm/T_invoke_super_14.java $(JACK_PATH)/tests/com/android/jack/opcodes/invoke_super/jm/T_invoke_super_15.java $(JACK_PATH)/tests/com/android/jack/opcodes/invoke_super/jm/T_invoke_super_18.java $(JACK_PATH)/tests/com/android/jack/opcodes/invoke_super/jm/T_invoke_super_19.java $(JACK_PATH)/tests/com/android/jack/opcodes/invoke_super/jm/T_invoke_super_26.java $(JACK_PATH)/tests/com/android/jack/opcodes/invoke_super/jm/TSuper2.java $(JACK_PATH)/tests/com/android/jack/opcodes/invoke_super/jm/TSuper.java
+JACKTEST_WITHDX_SRC := tests/com/android/jack/opcodes/invoke_super/Test_invoke_super.java src/com/android/jack/DxTestCase.java
+JACKTEST_WITHJACK_SRC := tests/com/android/jack/opcodes/invoke_super/jm/T_invoke_super_1.java tests/com/android/jack/opcodes/invoke_super/jm/T_invoke_super_14.java tests/com/android/jack/opcodes/invoke_super/jm/T_invoke_super_15.java tests/com/android/jack/opcodes/invoke_super/jm/T_invoke_super_18.java tests/com/android/jack/opcodes/invoke_super/jm/T_invoke_super_19.java tests/com/android/jack/opcodes/invoke_super/jm/T_invoke_super_26.java tests/com/android/jack/opcodes/invoke_super/jm/TSuper2.java tests/com/android/jack/opcodes/invoke_super/jm/TSuper.java
JACKTEST_JUNIT := com.android.jack.opcodes.invoke_super.Test_invoke_super
include $(JACK_RUN_TEST)
@@ -1173,8 +1173,8 @@ include $(JACK_RUN_TEST)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := opcode-invoke_direct
-JACKTEST_WITHDX_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/invoke_direct/Test_invoke_direct.java $(JACK_PATH)/src/com/android/jack/DxTestCase.java
-JACKTEST_WITHJACK_SRC := $(JACK_PATH)/tests/com/android/jack/opcodes/invoke_direct/jm/T_invoke_direct_2.java $(JACK_PATH)/tests/com/android/jack/opcodes/invoke_direct/jm/T_invoke_direct_21.java $(JACK_PATH)/tests/com/android/jack/opcodes/invoke_direct/jm/TSuper.java
+JACKTEST_WITHDX_SRC := tests/com/android/jack/opcodes/invoke_direct/Test_invoke_direct.java src/com/android/jack/DxTestCase.java
+JACKTEST_WITHJACK_SRC := tests/com/android/jack/opcodes/invoke_direct/jm/T_invoke_direct_2.java tests/com/android/jack/opcodes/invoke_direct/jm/T_invoke_direct_21.java tests/com/android/jack/opcodes/invoke_direct/jm/TSuper.java
JACKTEST_JUNIT := com.android.jack.opcodes.invoke_direct.Test_invoke_direct
include $(JACK_RUN_TEST)
diff --git a/jack-tests/tests/com/android/jack/shrob/test011/test.mk b/jack-tests/tests/com/android/jack/shrob/test011/test.mk
index 77f13917..3b06de49 100644
--- a/jack-tests/tests/com/android/jack/shrob/test011/test.mk
+++ b/jack-tests/tests/com/android/jack/shrob/test011/test.mk
@@ -12,14 +12,14 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-private_path:= $(call my-dir)
+LOCAL_PATH:= $(call my-dir)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := shrob/test011
-JACKTEST_ARGS := --proguard-flags $(private_path)/proguard.flags001 --proguard-flags $(private_path)/../dontobfuscate.flags
-JACKTEST_WITHJACK_SRC := $(call all-java-files-under, $(abspath $(private_path)/jack/))
-JACKTEST_WITHDX_SRC := $(private_path)/dx/Tests.java
+JACKTEST_ARGS := --proguard-flags $(LOCAL_PATH)/proguard.flags001 --proguard-flags $(LOCAL_PATH)/../dontobfuscate.flags
+JACKTEST_WITHJACK_SRC := $(call all-java-files-under, jack)
+JACKTEST_WITHDX_SRC := dx/Tests.java
JACKTEST_JUNIT := com.android.jack.$(subst /,.,$(JACKTEST_MODULE)).dx.Tests
include $(JACK_RUN_TEST)
diff --git a/jack-tests/tests/com/android/jack/shrob/test011/test2.mk b/jack-tests/tests/com/android/jack/shrob/test011/test2.mk
index 457cb059..89a05134 100644
--- a/jack-tests/tests/com/android/jack/shrob/test011/test2.mk
+++ b/jack-tests/tests/com/android/jack/shrob/test011/test2.mk
@@ -12,14 +12,14 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-private_path:= $(call my-dir)
+LOCAL_PATH:= $(call my-dir)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := shrob/test011_2
-JACKTEST_ARGS := --proguard-flags $(private_path)/proguard.flags002
-JACKTEST_WITHJACK_SRC := $(call all-java-files-under, $(abspath $(private_path)/jack/))
-JACKTEST_WITHDX_SRC := $(private_path)/dx/Tests2.java
+JACKTEST_ARGS := --proguard-flags $(LOCAL_PATH)/proguard.flags002
+JACKTEST_WITHJACK_SRC := $(call all-java-files-under, jack)
+JACKTEST_WITHDX_SRC := dx/Tests2.java
JACKTEST_JUNIT := com.android.jack.shrob.test011.dx.Tests2
include $(JACK_RUN_TEST)
diff --git a/jack-tests/tests/com/android/jack/shrob/test016/test.mk b/jack-tests/tests/com/android/jack/shrob/test016/test.mk
index 981a3378..059a754d 100644
--- a/jack-tests/tests/com/android/jack/shrob/test016/test.mk
+++ b/jack-tests/tests/com/android/jack/shrob/test016/test.mk
@@ -12,15 +12,15 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-private_path:= $(call my-dir)
+LOCAL_PATH:= $(call my-dir)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := shrob/test016
-JACKTEST_ARGS := --proguard-flags $(private_path)/proguard.flags001 \
- --proguard-flags $(private_path)/applyMapping.flags
-JACKTEST_WITHJACK_SRC := $(call all-java-files-under, $(abspath $(private_path)/jack/))
-JACKTEST_WITHDX_SRC := $(private_path)/dx/Tests.java
+JACKTEST_ARGS := --proguard-flags $(LOCAL_PATH)/proguard.flags001 \
+ --proguard-flags $(LOCAL_PATH)/applyMapping.flags
+JACKTEST_WITHJACK_SRC := $(call all-java-files-under, jack)
+JACKTEST_WITHDX_SRC := dx/Tests.java
JACKTEST_JUNIT := com.android.jack.$(subst /,.,$(JACKTEST_MODULE)).dx.Tests
include $(JACK_RUN_TEST)
diff --git a/jack-tests/tests/com/android/jack/shrob/test025/test.mk b/jack-tests/tests/com/android/jack/shrob/test025/test.mk
index b4d43075..312131e7 100644
--- a/jack-tests/tests/com/android/jack/shrob/test025/test.mk
+++ b/jack-tests/tests/com/android/jack/shrob/test025/test.mk
@@ -12,14 +12,14 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-private_path:= $(call my-dir)
+LOCAL_PATH:= $(call my-dir)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := shrob/test025
-JACKTEST_ARGS := --proguard-flags $(private_path)/proguard.flags001
-JACKTEST_WITHJACK_SRC := $(call all-java-files-under, $(abspath $(private_path)/jack/))
-JACKTEST_WITHDX_SRC := $(private_path)/dx/Tests.java
+JACKTEST_ARGS := --proguard-flags $(LOCAL_PATH)/proguard.flags001
+JACKTEST_WITHJACK_SRC := $(call all-java-files-under, jack)
+JACKTEST_WITHDX_SRC := dx/Tests.java
JACKTEST_JUNIT := com.android.jack.$(subst /,.,$(JACKTEST_MODULE)).dx.Tests
include $(JACK_RUN_TEST)
diff --git a/jack-tests/tests/com/android/jack/shrob/test030/test.mk b/jack-tests/tests/com/android/jack/shrob/test030/test.mk
index 4bf92c66..9227a7cf 100644
--- a/jack-tests/tests/com/android/jack/shrob/test030/test.mk
+++ b/jack-tests/tests/com/android/jack/shrob/test030/test.mk
@@ -12,14 +12,14 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-private_path:= $(call my-dir)
+LOCAL_PATH:= $(call my-dir)
include $(JACK_CLEAR_VARS)
JACKTEST_MODULE := shrob/test030
-JACKTEST_ARGS := --proguard-flags $(private_path)/proguard.flags001 --proguard-flags $(private_path)/../dontobfuscate.flags
-JACKTEST_WITHJACK_SRC := $(call all-java-files-under, $(abspath $(private_path)/jack/))
-JACKTEST_WITHDX_SRC := $(private_path)/dx/Tests.java
+JACKTEST_ARGS := --proguard-flags $(LOCAL_PATH)/proguard.flags001 --proguard-flags $(LOCAL_PATH)/../dontobfuscate.flags
+JACKTEST_WITHJACK_SRC := $(call all-java-files-under, jack)
+JACKTEST_WITHDX_SRC := dx/Tests.java
JACKTEST_JUNIT := com.android.jack.$(subst /,.,$(JACKTEST_MODULE)).dx.Tests
include $(JACK_RUN_TEST)
diff --git a/jack/Android.mk b/jack/Android.mk
index de0c547d..3cc620e1 100644
--- a/jack/Android.mk
+++ b/jack/Android.mk
@@ -105,10 +105,12 @@ $(intermediates)/rsc/jack.properties:
LOCAL_JAVA_RESOURCE_FILES := $(intermediates)/rsc/jack.properties
-LOCAL_POST_INSTALL_CMD := java -jar $(call java-lib-libs,sched-build,true) $(call java-lib-libs,$(LOCAL_MODULE),true) $(call java-lib-libs,$(JACK_STATIC_JAVA_LIBRARIES),true) $(JACK_JAR)
-
include $(BUILD_HOST_JAVA_LIBRARY)
+# overwrite install rule, using LOCAL_POST_INSTALL_CMD may cause the installed jar to be used before the post install command is completed
+$(LOCAL_INSTALLED_MODULE): $(LOCAL_BUILT_MODULE)
+ java -jar $(call java-lib-libs,sched-build,true) $< $(call java-lib-libs,$(JACK_STATIC_JAVA_LIBRARIES),true) $@
+
# Merge with sched lib support
$(LOCAL_BUILT_MODULE): $(call java-lib-libs,sched-build,true)
@@ -150,18 +152,17 @@ LOCAL_REQUIRED_MODULES:= \
android.policy \
hamcrest-core-jack
-LOCAL_POST_INSTALL_CMD := java -jar $(call java-lib-libs,sched-build,true) $(call java-lib-libs,$(LOCAL_MODULE),true) $(call java-lib-libs,$(TEST_STATIC_JAVA_LIBRARIES),true) $(HOST_OUT_JAVA_LIBRARIES)/$(LOCAL_MODULE)$(COMMON_JAVA_PACKAGE_SUFFIX)
-
include $(BUILD_HOST_JAVA_LIBRARY)
-# Merge with sched lib support
-$(LOCAL_BUILT_MODULE): $(call java-lib-libs,sched-build,true)
+# overwrite install rule, using LOCAL_POST_INSTALL_CMD may cause the installed jar to be used before the post install command is completed
+$(LOCAL_INSTALLED_MODULE): $(LOCAL_BUILT_MODULE) $(call java-lib-libs,sched-build,true)
+ java -jar $(call java-lib-libs,sched-build,true) $< $(JACK_JAR) $(call java-lib-libs,$(TEST_STATIC_JAVA_LIBRARIES),true) $@
#
# Test targets
#
-LIB_JACK_UNIT_TESTS := $(LOCAL_BUILT_MODULE)
+LIB_JACK_UNIT_TESTS := $(LOCAL_INSTALLED_MODULE)
local_unit_libs := $(call java-lib-files,core-libart-hostdex junit4-hostdex-jack,true)
.PHONY: test-jack-unit
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-23 03:02:25 +0000