diff options
author | Yohann Roussel <yroussel@google.com> | 2014-10-14 16:40:48 +0200 |
---|---|---|
committer | Yohann Roussel <yroussel@google.com> | 2014-10-24 08:20:04 +0000 |
commit | 423baa8c7c8b0d789576e852b9d5e3c6fdfd7772 (patch) | |
tree | 0da9015a744d7a6d1c9983e4448d218234abc69c /jack-tests/build | |
parent | ada9fe075543be3c4197478328001f1d44219bc8 (diff) | |
download | toolchain_jack-423baa8c7c8b0d789576e852b9d5e3c6fdfd7772.tar.gz toolchain_jack-423baa8c7c8b0d789576e852b9d5e3c6fdfd7772.tar.bz2 toolchain_jack-423baa8c7c8b0d789576e852b9d5e3c6fdfd7772.zip |
Adapt jack tests build rule to build system
Change-Id: I184c70f79d1410bcd1b66be3cef60815ec995659
Diffstat (limited to 'jack-tests/build')
-rw-r--r-- | jack-tests/build/run-test-common.mk | 27 | ||||
-rw-r--r-- | jack-tests/build/run-test.mk | 166 | ||||
-rw-r--r-- | jack-tests/build/test.mk | 20 |
3 files changed, 74 insertions, 139 deletions
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 |