Move art content to /data
oat tests, gtests, and run-test content to /data/art-test
boot.oat and boot.art to /data/art-cache
Change-Id: I68f9f6798bc4ea0596642ff5624f3e77dec6ccbe
diff --git a/build/Android.common.mk b/build/Android.common.mk
index 378d414..1968eb6 100644
--- a/build/Android.common.mk
+++ b/build/Android.common.mk
@@ -14,6 +14,14 @@
# limitations under the License.
#
+# art-cache
+ART_CACHE_DIR := /data/art-cache
+ART_CACHE_OUT := $(TARGET_OUT_DATA)/art-cache
+
+# directory used for tests on device
+ART_TEST_DIR := /data/art-test
+ART_TEST_OUT := $(TARGET_OUT_DATA)/art-test
+
ART_CPP_EXTENSION := .cc
ART_C_INCLUDES := \
diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk
index 73dddf0..4ea6f9a 100644
--- a/build/Android.gtest.mk
+++ b/build/Android.gtest.mk
@@ -16,6 +16,8 @@
ART_HOST_TEST_EXECUTABLES :=
ART_TARGET_TEST_EXECUTABLES :=
+ART_HOST_TEST_TARGETS :=
+ART_TARGET_TEST_TARGETS :=
# $(1): target or host
# $(2): file name
@@ -29,13 +31,15 @@
art_target_or_host := $(1)
art_gtest_filename := $(2)
+ art_gtest_name := $$(notdir $$(basename $$(art_gtest_filename)))
+
include $(CLEAR_VARS)
ifeq ($$(art_target_or_host),target)
include external/stlport/libstlport.mk
endif
LOCAL_CPP_EXTENSION := $(ART_CPP_EXTENSION)
- LOCAL_MODULE := $$(notdir $$(basename $$(art_gtest_filename)))
+ LOCAL_MODULE := $$(art_gtest_name)
LOCAL_MODULE_TAGS := tests
LOCAL_SRC_FILES := $$(art_gtest_filename)
LOCAL_C_INCLUDES += $(ART_C_INCLUDES)
@@ -45,16 +49,38 @@
LOCAL_CFLAGS := $(ART_TARGET_CFLAGS) $(ART_TARGET_DEBUG_CFLAGS)
LOCAL_SHARED_LIBRARIES += libdl libicuuc libicui18n libnativehelper libstlport libz
LOCAL_STATIC_LIBRARIES := libgtest libgtest_main
+ LOCAL_MODULE_PATH := $(ART_TEST_OUT)
include $(BUILD_EXECUTABLE)
- ART_TARGET_TEST_EXECUTABLES += $(TARGET_OUT_EXECUTABLES)/$$(LOCAL_MODULE)
+ art_gtest_exe := $(HOST_OUT_EXECUTABLES)/$$(LOCAL_MODULE)
+ ART_TARGET_TEST_EXECUTABLES += $$(art_gtest_exe)
else # host
LOCAL_CFLAGS := $(ART_HOST_CFLAGS) $(ART_HOST_DEBUG_CFLAGS)
LOCAL_SHARED_LIBRARIES += libicuuc-host libicui18n-host libnativehelper libz-host
LOCAL_WHOLE_STATIC_LIBRARIES := libgtest_main_host
include $(BUILD_HOST_EXECUTABLE)
- ART_HOST_TEST_EXECUTABLES += $(HOST_OUT_EXECUTABLES)/$$(LOCAL_MODULE)
+ art_gtest_exe := $(HOST_OUT_EXECUTABLES)/$$(LOCAL_MODULE)
+ ART_HOST_TEST_EXECUTABLES += $$(art_gtest_exe)
endif
+art_gtest_target := test-art-$$(art_target_or_host)-gtest-$$(art_gtest_name)
+ifeq ($$(art_target_or_host),target)
+.PHONY: $$(art_gtest_target)
+$$(art_gtest_target): $$(art_gtest_exe) test-art-target-sync
+ adb shell touch $(ART_TEST_DIR)/$$@
+ adb shell rm $(ART_TEST_DIR)/$$@
+ adb shell sh -c "$(ART_TEST_DIR)/$$(notdir $$<) && touch $(ART_TEST_DIR)/$$@"
+ $(hide) (adb pull $(ART_TEST_DIR)/$$@ /tmp/ && echo $$@ PASSED) || (echo $$@ FAILED && exit 1)
+ $(hide) rm /tmp/$$@
+
+ART_TARGET_TEST_TARGETS += $$(art_gtest_target)
+else
+.PHONY: $$(art_gtest_target)
+$$(art_gtest_target): $$(art_gtest_exe)
+ $$<
+ @echo $$@ PASSED
+
+ART_HOST_TEST_TARGETS += $$(art_gtest_target)
+endif
endef
ifeq ($(ART_BUILD_TARGET),true)
diff --git a/build/Android.oat.mk b/build/Android.oat.mk
index 4839667..b8047aa 100644
--- a/build/Android.oat.mk
+++ b/build/Android.oat.mk
@@ -37,27 +37,29 @@
TARGET_CORE_DEX := $(foreach jar,$(TARGET_CORE_JARS),$(TARGET_OUT_JAVA_LIBRARIES)/$(jar).jar)
HOST_CORE_OAT := $(HOST_OUT_JAVA_LIBRARIES)/core.oat
-TARGET_CORE_OAT := $(TARGET_OUT_JAVA_LIBRARIES)/core.oat
+TARGET_CORE_OAT := $(ART_TEST_OUT)/core.oat
HOST_CORE_IMG := $(HOST_OUT_JAVA_LIBRARIES)/core.art
-TARGET_CORE_IMG := $(TARGET_OUT_JAVA_LIBRARIES)/core.art
+TARGET_CORE_IMG := $(ART_TEST_OUT)/core.art
# TODO: change DEX2OATD to order-only prerequisite when output is stable
$(HOST_CORE_OAT): $(HOST_CORE_DEX) $(DEX2OAT)
@echo "host dex2oat: $@ ($<)"
+ @mkdir -p $(dir $@)
$(hide) $(DEX2OAT) -Xms16m -Xmx16m $(addprefix --dex-file=,$(filter-out $(DEX2OAT),$^)) --oat=$@ --image=$(HOST_CORE_IMG) --base=$(IMG_HOST_BASE_ADDRESS)
# TODO: change DEX2OATD to order-only prerequisite when output is stable
$(TARGET_CORE_OAT): $(TARGET_CORE_DEX) $(DEX2OAT)
@echo "target dex2oat: $@ ($<)"
+ @mkdir -p $(dir $@)
$(hide) $(DEX2OAT) -Xms32m -Xmx32m $(addprefix --dex-file=,$(filter-out $(DEX2OAT),$^)) --oat=$@ --image=$(TARGET_CORE_IMG) --base=$(IMG_TARGET_BASE_ADDRESS) --host-prefix=$(PRODUCT_OUT)
########################################################################
# The full system boot classpath
TARGET_BOOT_JARS := $(subst :, ,$(DEXPREOPT_BOOT_JARS))
TARGET_BOOT_DEX := $(foreach jar,$(TARGET_BOOT_JARS),$(TARGET_OUT_JAVA_LIBRARIES)/$(jar).jar)
-TARGET_BOOT_OAT := $(TARGET_OUT_JAVA_LIBRARIES)/boot.oat
-TARGET_BOOT_IMG := $(TARGET_OUT_JAVA_LIBRARIES)/boot.art
+TARGET_BOOT_OAT := $(ART_CACHE_OUT)/boot.oat
+TARGET_BOOT_IMG := $(ART_CACHE_OUT)/boot.art
# TODO: change DEX2OATD to order-only prerequisite when output is stable
$(TARGET_BOOT_OAT): $(TARGET_BOOT_DEX) $(DEX2OAT)
diff --git a/build/Android.oattest.mk b/build/Android.oattest.mk
index 40e0d40..8125df1 100644
--- a/build/Android.oattest.mk
+++ b/build/Android.oattest.mk
@@ -26,6 +26,7 @@
LOCAL_SRC_FILES := $(call all-java-files-under, test/$(1))
LOCAL_JAVA_LIBRARIES := core
LOCAL_NO_STANDARD_LIBRARIES := true
+ LOCAL_MODULE_PATH := $(ART_TEST_OUT)
include $(BUILD_JAVA_LIBRARY)
ART_TEST_DEX_FILES += $(TARGET_OUT_JAVA_LIBRARIES)/$$(LOCAL_MODULE).jar
endef
@@ -48,8 +49,8 @@
# $(1): directory
define build-art-test-oat
- $(call build-art-oat,$(TARGET_OUT_JAVA_LIBRARIES)/art-test-dex-$(1).jar,$(TARGET_CORE_OAT),$(TARGET_CORE_DEX))
- ART_TEST_OAT_FILES += $(TARGET_OUT_JAVA_LIBRARIES)/art-test-dex-$(1).oat
+ $(call build-art-oat,$(ART_TEST_OUT)/art-test-dex-$(1).jar,$(TARGET_CORE_OAT),$(TARGET_CORE_DEX))
+ ART_TEST_OAT_FILES += $(ART_TEST_OUT)/art-test-dex-$(1).oat
endef
$(foreach dir,$(TEST_DEX_DIRECTORIES), $(eval $(call build-art-test-oat,$(dir))))
@@ -62,10 +63,10 @@
define declare-test-test-target
.PHONY: test-art-target-oat-$(1)
test-art-target-oat-$(1): test-art-target-sync
- adb shell touch /sdcard/test-art-target-oat-$(1)
- adb shell rm /sdcard/test-art-target-oat-$(1)
- adb shell sh -c "oatexecd -Ximage:/system/framework/core.art -classpath /system/framework/art-test-dex-$(1).jar $(1) $(2) && touch /sdcard/test-art-target-oat-$(1)"
- $(hide) (adb pull /sdcard/test-art-target-oat-$(1) /tmp/ && echo test-art-target-oat-$(1) PASSED) || (echo test-art-target-oat-$(1) FAILED && exit 1)
+ adb shell touch $(ART_TEST_DIR)/test-art-target-oat-$(1)
+ adb shell rm $(ART_TEST_DIR)/test-art-target-oat-$(1)
+ adb shell sh -c "oatexecd -Ximage:$(ART_TEST_DIR)/core.art -classpath $(ART_TEST_DIR)/art-test-dex-$(1).jar $(1) $(2) && touch $(ART_TEST_DIR)/test-art-target-oat-$(1)"
+ $(hide) (adb pull $(ART_TEST_DIR)/test-art-target-oat-$(1) /tmp/ && echo test-art-target-oat-$(1) PASSED) || (echo test-art-target-oat-$(1) FAILED && exit 1)
$(hide) rm /tmp/test-art-target-oat-$(1)
ART_TEST_OAT_TARGETS += test-art-target-oat-$(1)