diff options
| -rw-r--r-- | Android.mk | 8 | ||||
| -rw-r--r-- | build/Android.common_path.mk | 1 | ||||
| -rw-r--r-- | build/Android.common_test.mk | 3 | ||||
| -rw-r--r-- | build/Android.gtest.mk | 34 | ||||
| -rw-r--r-- | test/Android.oat.mk | 7 |
5 files changed, 28 insertions, 25 deletions
@@ -105,9 +105,13 @@ include $(art_path)/sigchainlib/Android.mk # ART_HOST_DEPENDENCIES depends on Android.executable.mk above for ART_HOST_EXECUTABLES -ART_HOST_DEPENDENCIES := $(ART_HOST_EXECUTABLES) $(HOST_OUT_JAVA_LIBRARIES)/core-libart-hostdex.jar \ +ART_HOST_DEPENDENCIES := \ + $(ART_HOST_EXECUTABLES) \ + $(HOST_OUT_JAVA_LIBRARIES)/core-libart-hostdex.jar \ $(HOST_LIBRARY_PATH)/libjavacore$(ART_HOST_SHLIB_EXTENSION) -ART_TARGET_DEPENDENCIES := $(ART_TARGET_EXECUTABLES) $(TARGET_OUT_JAVA_LIBRARIES)/core-libart.jar \ +ART_TARGET_DEPENDENCIES := \ + $(ART_TARGET_EXECUTABLES) \ + $(TARGET_OUT_JAVA_LIBRARIES)/core-libart.jar \ $(TARGET_OUT_SHARED_LIBRARIES)/libjavacore.so ifdef TARGET_2ND_ARCH ART_TARGET_DEPENDENCIES += $(2ND_TARGET_OUT_SHARED_LIBRARIES)/libjavacore.so diff --git a/build/Android.common_path.mk b/build/Android.common_path.mk index d672393..8c0d9f2 100644 --- a/build/Android.common_path.mk +++ b/build/Android.common_path.mk @@ -72,5 +72,4 @@ TARGET_CORE_DEX_LOCATIONS := $(foreach jar,$(TARGET_CORE_JARS),/$(DEXPREOPT_BOOT HOST_CORE_DEX_FILES := $(foreach jar,$(HOST_CORE_JARS), $(call intermediates-dir-for,JAVA_LIBRARIES,$(jar),t,COMMON)/javalib.jar) TARGET_CORE_DEX_FILES := $(foreach jar,$(TARGET_CORE_JARS),$(call intermediates-dir-for,JAVA_LIBRARIES,$(jar), ,COMMON)/javalib.jar) - endif # ANDROID_COMMON_PATH_MK diff --git a/build/Android.common_test.mk b/build/Android.common_test.mk index 1815f50..21a8931 100644 --- a/build/Android.common_test.mk +++ b/build/Android.common_test.mk @@ -99,6 +99,7 @@ define build-art-test-dex LOCAL_MODULE_PATH := $(3) LOCAL_DEX_PREOPT_IMAGE_LOCATION := $(TARGET_CORE_IMG_OUT) include $(BUILD_JAVA_LIBRARY) + $(5) := $$(LOCAL_INSTALLED_MODULE) endif ifeq ($(ART_BUILD_HOST),true) include $(CLEAR_VARS) @@ -110,8 +111,8 @@ define build-art-test-dex LOCAL_JAVA_LIBRARIES := $(HOST_CORE_JARS) LOCAL_DEX_PREOPT_IMAGE := $(HOST_CORE_IMG_LOCATION) include $(BUILD_HOST_DALVIK_JAVA_LIBRARY) + $(5)-host := $$(LOCAL_INSTALLED_MODULE) endif - $(5) := $$(LOCAL_INSTALLED_MODULE) endef endif # ANDROID_COMMON_TEST_MK diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk index a6f6298..69d6c5a 100644 --- a/build/Android.gtest.mk +++ b/build/Android.gtest.mk @@ -45,20 +45,17 @@ $(foreach dir,$(GTEST_DEX_DIRECTORIES), $(eval $(call build-art-test-dex,art-gte $(ART_TARGET_NATIVETEST_OUT),art/build/Android.gtest.mk,ART_GTEST_$(dir)_DEX))) # Dex file dependencies for each gtest. -ART_GTEST_class_linker_test_DEPS := $(ART_GTEST_Interfaces_DEX) $(ART_GTEST_MyClass_DEX) \ - $(ART_GTEST_Nested_DEX) $(ART_GTEST_Statics_DEX) $(ART_GTEST_StaticsFromCode_DEX) -ART_GTEST_compiler_driver_test_DEPS := $(ART_GTEST_AbstractMethod_DEX) -ART_GTEST_dex_file_test_DEPS := $(ART_GTEST_GetMethodSignature_DEX) -ART_GTEST_exception_test_DEPS := $(ART_GTEST_ExceptionHandle_DEX) -ART_GTEST_jni_compiler_test_DEPS := $(ART_GTEST_MyClassNatives_DEX) -ART_GTEST_jni_internal_test_DEPS := $(ART_GTEST_AllFields_DEX) -ART_GTEST_object_test_DEPS := $(ART_GTEST_ProtoCompare_DEX) $(ART_GTEST_ProtoCompare2_DEX) \ - $(ART_GTEST_StaticsFromCode_DEX) $(ART_GTEST_XandY_DEX) -ART_GTEST_proxy_test_DEPS := $(ART_GTEST_Interfaces_DEX) -ART_GTEST_reflection_test_DEPS := $(ART_GTEST_Main_DEX) $(ART_GTEST_NonStaticLeafMethods_DEX) \ - $(ART_GTEST_StaticLeafMethods_DEX) -ART_GTEST_stub_test_DEPS := $(ART_GTEST_AllFields_DEX) -ART_GTEST_transaction_test_DEPS := $(ART_GTEST_Transaction_DEX) +ART_GTEST_class_linker_test_DEPS := Interfaces MyClass Nested Statics StaticsFromCode +ART_GTEST_compiler_driver_test_DEPS := AbstractMethod +ART_GTEST_dex_file_test_DEPS := GetMethodSignature +ART_GTEST_exception_test_DEPS := ExceptionHandle +ART_GTEST_jni_compiler_test_DEPS := MyClassNatives +ART_GTEST_jni_internal_test_DEPS := AllFields StaticLeafMethods +ART_GTEST_object_test_DEPS := ProtoCompare ProtoCompare2 StaticsFromCode XandY +ART_GTEST_proxy_test_DEPS := Interfaces +ART_GTEST_reflection_test_DEPS := Main NonStaticLeafMethods StaticLeafMethods +ART_GTEST_stub_test_DEPS := AllFields +ART_GTEST_transaction_test_DEPS := Transaction # The elf writer test has dependencies on core.oat. ART_GTEST_elf_writer_test_DEPS := $(HOST_CORE_OAT_OUT) $(2ND_HOST_CORE_OAT_OUT) \ @@ -194,12 +191,11 @@ ART_TEST_TARGET_GTEST_RULES := define define-art-gtest-rule-target gtest_rule := test-art-target-gtest-$(1)$$($(2)ART_PHONY_TEST_TARGET_SUFFIX) - # Add the test dependencies to test-art-target-sync, which will be a prerequisit for the test + # Add the test dependencies to test-art-target-sync, which will be a prerequisite for the test # to ensure files are pushed to the device. TEST_ART_TARGET_SYNC_DEPS += \ - $$(ART_GTEST_$(1)_DEPS) \ + $(foreach file,$(ART_GTEST_$(1)_DEPS),$(ART_GTEST_$(file)_DEX)) \ $$(ART_TARGET_NATIVETEST_OUT)/$$(TARGET_$(2)ARCH)/$(1) \ - $$(TARGET_CORE_DEX_LOCATIONS) \ $$($(2)TARGET_OUT_SHARED_LIBRARIES)/libjavacore.so .PHONY: $$(gtest_rule) @@ -234,7 +230,7 @@ define define-art-gtest-rule-host .PHONY: $$(gtest_rule) -$$(gtest_rule): $$(gtest_exe) $$(ART_GTEST_$(1)_DEPS) $$(gtest_deps) +$$(gtest_rule): $$(gtest_exe) $(foreach file,$(ART_GTEST_$(1)_DEPS),$(ART_GTEST_$(file)_DEX-host)) $$(gtest_deps) $(hide) ($$(call ART_TEST_SKIP,$$@) && $$< && $$(call ART_TEST_PASSED,$$@)) \ || $$(call ART_TEST_FAILED,$$@) @@ -461,4 +457,4 @@ ART_GTEST_stub_test_DEPS := ART_GTEST_transaction_test_DEPS := $(foreach dir,$(GTEST_DEX_DIRECTORIES), $(eval ART_GTEST_TEST_$(dir)_DEX :=)) GTEST_DEX_DIRECTORIES := -LOCAL_PATH :=
\ No newline at end of file +LOCAL_PATH := diff --git a/test/Android.oat.mk b/test/Android.oat.mk index 97f8cd5..3cf9f61 100644 --- a/test/Android.oat.mk +++ b/test/Android.oat.mk @@ -60,7 +60,10 @@ ART_TEST_TARGET_OAT$(2ND_ART_PHONY_TEST_TARGET_SUFFIX)_RULES := ART_TEST_TARGET_OAT_RULES := # We need dex2oat and dalvikvm on the target as well as the core image. -TEST_ART_TARGET_SYNC_DEPS += $(ART_TARGET_EXECUTABLES) $(TARGET_CORE_IMG_OUT) $(2ND_TARGET_CORE_IMG_OUT) +TEST_ART_TARGET_SYNC_DEPS += $(ART_TARGET_EXECUTABLES) $(TARGET_CORE_IMG_OUT) $(2ND_TARGET_CORE_IMG_OUT) $(ART_TARGET_TEST_OUT)/$(TARGET_ARCH)/libarttest.so +ifdef TARGET_2ND_ARCH +TEST_ART_TARGET_SYNC_DEPS += $(ART_TARGET_TEST_OUT)/$(TARGET_2ND_ARCH)/libarttest.so +endif # Define rule to run an individual oat test on the host. Output from the test is written to the # host in /tmp/android-data in a directory named after test's rule name (its target) and the parent @@ -72,7 +75,7 @@ TEST_ART_TARGET_SYNC_DEPS += $(ART_TARGET_EXECUTABLES) $(TARGET_CORE_IMG_OUT) $( # $(3): the target (rule name), e.g. test-art-target-oat-default-HelloWorld64 # $(4): -Xint or undefined - do we want to run with the interpreter or default. define define-test-art-oat-rule-target - # Add the test dependencies to test-art-target-sync, which will be a prerequisit for the test + # Add the test dependencies to test-art-target-sync, which will be a prerequisite for the test # to ensure files are pushed to the device. TEST_ART_TARGET_SYNC_DEPS += $$(ART_OAT_TEST_$(1)_DEX) |