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/Android.mk b/Android.mk
index e9bc1df..282dd3b 100644
--- a/Android.mk
+++ b/Android.mk
@@ -53,12 +53,16 @@
test-art: test-art-host test-art-target
@echo test-art PASSED
+.PHONY: test-art-gtest
+test-art-gtest: test-art-host test-art-target-gtest
+ @echo test-art-gtest PASSED
+
define run-host-tests-with
$(foreach file,$(sort $(ART_HOST_TEST_EXECUTABLES)),$(1) $(file) &&) true
endef
-ART_HOST_DEPENDENCIES := $(ART_HOST_EXECUTABLES) $(ANDROID_HOST_OUT)/framework/core-hostdex.jar
-ART_TARGET_DEPENDENCIES := $(ART_TARGET_EXECUTABLES) $(ANDROID_PRODUCT_OUT)/system/framework/core.jar
+ART_HOST_DEPENDENCIES := $(ART_HOST_EXECUTABLES) $(HOST_OUT_JAVA_LIBRARIES)/core-hostdex.jar
+ART_TARGET_DEPENDENCIES := $(ART_TARGET_EXECUTABLES) $(TARGET_OUT_JAVA_LIBRARIES)/core.jar
ART_HOST_TEST_DEPENDENCIES := $(ART_HOST_DEPENDENCIES) $(ART_TEST_OAT_FILES)
ART_TARGET_TEST_DEPENDENCIES := $(ART_TARGET_DEPENDENCIES) $(ART_TEST_OAT_FILES)
@@ -70,8 +74,7 @@
# "mm test-art-host" to build and run all host tests
.PHONY: test-art-host
-test-art-host: $(ART_HOST_TEST_DEPENDENCIES)
- $(call run-host-tests-with,)
+test-art-host: $(ART_HOST_TEST_DEPENDENCIES) $(ART_HOST_TEST_TARGETS)
@echo test-art-host PASSED
# "mm valgrind-art-host" to build and run all host tests under valgrind.
@@ -98,14 +101,10 @@
test-art-target-sync: $(ART_TARGET_TEST_DEPENDENCIES)
adb remount
adb sync
+ adb shell mkdir -p $(ART_TEST_DIR)
.PHONY: test-art-target-gtest
-test-art-target-gtest: test-art-target-sync
- adb shell touch /sdcard/test-art-target-gtest
- adb shell rm /sdcard/test-art-target-gtest
- adb shell sh -c "$(foreach file,$(sort $(ART_TARGET_TEST_EXECUTABLES)), /system/bin/$(notdir $(file)) &&) touch /sdcard/test-art-target-gtest"
- $(hide) (adb pull /sdcard/test-art-target-gtest /tmp/ && echo test-art-target-gtest PASSED) || echo test-art-target-gtest FAILED
- $(hide) rm /tmp/test-art-target-gtest
+test-art-target-gtest: $(ART_TARGET_TEST_TARGETS)
.PHONY: test-art-target-oat
test-art-target-oat: $(ART_TEST_OAT_TARGETS)
@@ -137,8 +136,8 @@
test-art-target-oat-process-am: $(TARGET_OUT_JAVA_LIBRARIES)/am.oat test-art-target-sync
adb remount
adb sync
- adb shell sh -c "export CLASSPATH=/system/framework/am.jar && oat_processd /system/bin/app_process -Ximage:/system/framework/boot.art /system/bin com.android.commands.am.Am start http://android.com && touch /sdcard/test-art-target-process-am"
- $(hide) (adb pull /sdcard/test-art-target-process-am /tmp/ && echo test-art-target-process-am PASSED) || echo test-art-target-process-am FAILED
+ adb shell sh -c "export CLASSPATH=/system/framework/am.jar && oat_processd /system/bin/app_process -Ximage:$(ART_CACHE_DIR)/boot.art /system/bin com.android.commands.am.Am start http://android.com && touch $(ART_TEST_DIR)/test-art-target-process-am"
+ $(hide) (adb pull $(ART_TEST_DIR)/test-art-target-process-am /tmp/ && echo test-art-target-process-am PASSED) || echo test-art-target-process-am FAILED
$(hide) rm /tmp/test-art-target-process-am
$(eval $(call build-art-framework-oat,$(TARGET_OUT_APPS)/Calculator.apk))
@@ -146,9 +145,9 @@
.PHONY: test-art-target-oat-process-Calculator
# Note that using this instead of "adb shell am start" make sure that the /data/art-cache is up-to-date
test-art-target-oat-process-Calculator: $(TARGET_OUT_APPS)/Calculator.oat $(TARGET_OUT_JAVA_LIBRARIES)/am.oat test-art-target-sync
- mkdir -p $(TARGET_OUT_DATA)/art-cache
+ mkdir -p $(ART_CACHE_OUT)
unzip $(TARGET_OUT_APPS)/Calculator.apk classes.dex -d $(TARGET_OUT_DATA)/art-cache
- mv $(TARGET_OUT_DATA)/art-cache/classes.dex $(TARGET_OUT_DATA)/art-cache/system@app@Calculator.apk@classes.dex.`unzip -lv $(TARGET_OUT_APPS)/Calculator.apk classes.dex | grep classes.dex | sed -E 's/.* ([0-9a-f]+) classes.dex/\1/'` # note this is extracting the crc32 that is needed as the file extension
+ mv $(TARGET_OUT_DATA)/art-cache/classes.dex $(ART_CACHE_OUT)/system@app@Calculator.apk@classes.dex.`unzip -lv $(TARGET_OUT_APPS)/Calculator.apk classes.dex | grep classes.dex | sed -E 's/.* ([0-9a-f]+) classes.dex/\1/'` # note this is extracting the crc32 that is needed as the file extension
adb remount
adb sync
if [ "`adb shell getprop wrap.com.android.calculator2 | tr -d '\r'`" = "oat_processd" ]; then \
@@ -161,8 +160,8 @@
sleep 30; \
fi
adb shell kill `adb shell ps | fgrep com.android.calculator2 | sed -e 's/[^ ]* *\([0-9]*\).*/\1/'`
- adb shell sh -c "export CLASSPATH=/system/framework/am.jar && oat_processd /system/bin/app_process -Ximage:/system/framework/boot.art /system/bin com.android.commands.am.Am start -a android.intent.action.MAIN -n com.android.calculator2/.Calculator && touch /sdcard/test-art-target-process-Calculator"
- $(hide) (adb pull /sdcard/test-art-target-process-Calculator /tmp/ && echo test-art-target-process-Calculator PASSED) || echo test-art-target-process-Calculator FAILED
+ adb shell sh -c "export CLASSPATH=/system/framework/am.jar && oat_processd /system/bin/app_process -Ximage:$(ART_CACHE_DIR)/boot.art /system/bin com.android.commands.am.Am start -a android.intent.action.MAIN -n com.android.calculator2/.Calculator && touch $(ART_TEST_DIR)/test-art-target-process-Calculator"
+ $(hide) (adb pull $(ART_TEST_DIR)/test-art-target-process-Calculator /tmp/ && echo test-art-target-process-Calculator PASSED) || echo test-art-target-process-Calculator FAILED
$(hide) rm /tmp/test-art-target-process-Calculator
########################################################################
@@ -177,11 +176,12 @@
.PHONY: zygote-artd-target-sync
zygote-artd-target-sync: $(ART_TARGET_DEPENDENCIES)
- cp $(ANDROID_PRODUCT_OUT)/system/lib/libartd.so $(ANDROID_PRODUCT_OUT)/system/lib/libdvm.so
- cp $(ANDROID_PRODUCT_OUT)/symbols/system/lib/libartd.so $(ANDROID_PRODUCT_OUT)/symbols/system/lib/libdvm.so
+ cp $(TARGET_OUT_SHARED_LIBRARIES)/libartd.so $(TARGET_OUT_SHARED_LIBRARIES)/libdvm.so
+ cp $(TARGET_OUT_SHARED_LIBRARIES_UNSTRIPPED)/libartd.so $(TARGET_OUT_SHARED_LIBRARIES_UNSTRIPPED)/libdvm.so
adb remount
adb sync
+.PHONY: zygote-artd
zygote-artd: $(TARGET_BOOT_OAT) zygote-artd-target-sync
sed 's/--start-system-server/--start-system-server --no-preload/' < system/core/rootdir/init.rc > $(ANDROID_PRODUCT_OUT)/root/init.rc
rm -f $(ANDROID_PRODUCT_OUT)/boot.img
@@ -192,8 +192,8 @@
.PHONY: zygote-dalvik
zygote-dalvik:
- cp $(ANDROID_PRODUCT_OUT)/obj/lib/libdvm.so $(ANDROID_PRODUCT_OUT)/system/lib/libdvm.so
- cp $(ANDROID_PRODUCT_OUT)/obj/SHARED_LIBRARIES/libdvm_intermediates/LINKED/libdvm.so $(ANDROID_PRODUCT_OUT)/symbols/system/lib/libdvm.so
+ cp $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/libdvm.so $(TARGET_OUT_SHARED_LIBRARIES)/libdvm.so
+ cp $(call intermediates-dir-for,SHARED_LIBRARIES,libdvm)/LINKED/libdvm.so $(TARGET_OUT_SHARED_LIBRARIES_UNSTRIPPED)/libdvm.so
adb remount
adb sync
cp system/core/rootdir/init.rc $(ANDROID_PRODUCT_OUT)/root/init.rc
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)
diff --git a/oat_process/app_main.cpp b/oat_process/app_main.cpp
index 978fd31..cee5e8b 100644
--- a/oat_process/app_main.cpp
+++ b/oat_process/app_main.cpp
@@ -164,9 +164,9 @@
// TODO: remove when we default the boot image
int oatArgc = argc + 1;
const char* oatArgv[oatArgc];
- if (strcmp(argv[0], "-Ximage:/system/framework/boot.art") != 0) {
+ if (strcmp(argv[0], "-Ximage:/data/art-cache/boot.art") != 0) {
LOG(INFO) << "Adding image arguments";
- oatArgv[0] = "-Ximage:/system/framework/boot.art";
+ oatArgv[0] = "-Ximage:/data/art-cache/boot.art";
memcpy(oatArgv + (oatArgc - argc), argv, argc * sizeof(*argv));
argv = oatArgv;
argc = oatArgc;
diff --git a/src/common_test.h b/src/common_test.h
index 024cde9..446ab5a 100644
--- a/src/common_test.h
+++ b/src/common_test.h
@@ -311,7 +311,7 @@
// on the host, just read target dex file
filename += getenv("ANDROID_PRODUCT_OUT");
}
- filename += "/system/framework/art-test-dex-";
+ filename += "/data/art-test/art-test-dex-";
filename += name;
filename += ".jar";
const DexFile* dex_file = DexFile::Open(filename, "");
diff --git a/src/dex2oat.cc b/src/dex2oat.cc
index b6a12835..e8cd26d 100644
--- a/src/dex2oat.cc
+++ b/src/dex2oat.cc
@@ -27,12 +27,12 @@
"\n");
fprintf(stderr,
" --image=<file.art>: specifies the required output image filename.\n"
- " Example: --image=/system/framework/boot.art\n"
+ " Example: --image=/data/art-cache/boot.art\n"
"\n");
// TODO: remove this by inferring from --image
fprintf(stderr,
" --oat=<file.oat>: specifies the required oat filename.\n"
- " Example: --image=/system/framework/boot.oat\n"
+ " Example: --image=/data/art-cache/boot.oat\n"
"\n");
fprintf(stderr,
" --base=<hex-address>: specifies the base address when creating a boot image.\n"
@@ -40,7 +40,7 @@
"\n");
fprintf(stderr,
" --boot-image=<file.art>: provide the image file for the boot class path.\n"
- " Example: --boot-image=/system/framework/boot.art\n"
+ " Example: --boot-image=/data/art-cache/boot.art\n"
"\n");
fprintf(stderr,
" --method may be used to limit compilation to a subset of methods.\n"
diff --git a/src/oatdump.cc b/src/oatdump.cc
index 4d99647..46f6c24 100644
--- a/src/oatdump.cc
+++ b/src/oatdump.cc
@@ -22,20 +22,20 @@
static void usage() {
fprintf(stderr,
"Usage: oatdump [options] ...\n"
- " Example: oatdump --image=$ANDROID_PRODUCT_OUT/system/framework/boot.art --host-prefix=$ANDROID_PRODUCT_OUT\n"
- " Example: adb shell oatdump --image=/system/framework/boot.art\n"
+ " Example: oatdump --image=$ANDROID_PRODUCT_OUT/data/art-cache/boot.art --host-prefix=$ANDROID_PRODUCT_OUT\n"
+ " Example: adb shell oatdump --image=/data/art-cache/boot.art\n"
"\n");
fprintf(stderr,
" --oat=<file.oat>: specifies an input oat filename.\n"
- " Example: --image=/system/framework/boot.oat\n"
+ " Example: --image=/data/art-cache/boot.oat\n"
"\n");
fprintf(stderr,
" --image=<file.art>: specifies an input image filename.\n"
- " Example: --image=/system/framework/boot.art\n"
+ " Example: --image=/data/art-cache/boot.art\n"
"\n");
fprintf(stderr,
" --boot-image=<file.art>: provide the image file for the boot class path.\n"
- " Example: --boot-image=/system/framework/boot.art\n"
+ " Example: --boot-image=/data/art-cache/boot.art\n"
"\n");
fprintf(stderr,
" --host-prefix may be used to translate host paths to target paths during\n"
diff --git a/src/runtime.cc b/src/runtime.cc
index 30fb4de..552bff8 100644
--- a/src/runtime.cc
+++ b/src/runtime.cc
@@ -275,7 +275,7 @@
parsed->jni_trace_ = option.substr(strlen("-Xjnitrace:")).data();
} else if (option == "-Xzygote") {
parsed->is_zygote_ = true;
- parsed->images_.push_back("/system/framework/boot.art");
+ parsed->images_.push_back("/data/art-cache/boot.art");
} else if (option.starts_with("-verbose:")) {
std::vector<std::string> verbose_options;
Split(option.substr(strlen("-verbose:")).data(), ',', verbose_options);
diff --git a/src/runtime.h b/src/runtime.h
index 76bd318..1ca9dca 100644
--- a/src/runtime.h
+++ b/src/runtime.h
@@ -225,9 +225,9 @@
// The host prefix is used during cross compilation. It is removed
// from the start of host paths such as:
- // $ANDROID_PRODUCT_OUT/system/framework/core.oat
+ // $ANDROID_PRODUCT_OUT/data/art-cache/boot.oat
// to produce target paths such as
- // /system/framework/core.oat
+ // /system/framework/boot.oat
// Similarly it is prepended to target paths to arrive back at a
// host past. In both cases this is necessary because image and oat
// files embedded expect paths of dependent files (an image points
diff --git a/test/056-const-string-jumbo/build b/test/056-const-string-jumbo/build
index fbd4116..d7a8268 100644
--- a/test/056-const-string-jumbo/build
+++ b/test/056-const-string-jumbo/build
@@ -44,10 +44,10 @@
dx -JXmx500m --debug --dex --no-optimize --positions=none --no-locals \
--dump-to=classes.lst --output=classes.dex classes
-zip ${ANDROID_PRODUCT_OUT}/system/framework/$TEST_NAME.jar classes.dex
+zip ${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME.jar classes.dex
dex2oatd -Xms16m -Xmx16m \
- --boot-image=${ANDROID_PRODUCT_OUT}/system/framework/core.art \
- --dex-file=${ANDROID_PRODUCT_OUT}/system/framework/$TEST_NAME.jar \
- --oat=${ANDROID_PRODUCT_OUT}/system/framework/$TEST_NAME.oat \
+ --boot-image=${ANDROID_PRODUCT_OUT}/data/art-test/core.art \
+ --dex-file=${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME.jar \
+ --oat=${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME.oat \
--host-prefix=${ANDROID_PRODUCT_OUT}
diff --git a/test/etc/default-build b/test/etc/default-build
index c3cdd79..0ac7fbf 100755
--- a/test/etc/default-build
+++ b/test/etc/default-build
@@ -26,12 +26,12 @@
dx -JXmx256m --debug --dex --dump-to=classes.lst --output=classes.dex \
--dump-width=1000 classes
-zip ${ANDROID_PRODUCT_OUT}/system/framework/$TEST_NAME.jar classes.dex
+zip ${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME.jar classes.dex
dex2oatd -Xms16m -Xmx16m \
- --boot-image=${ANDROID_PRODUCT_OUT}/system/framework/core.art \
- --dex-file=${ANDROID_PRODUCT_OUT}/system/framework/$TEST_NAME.jar \
- --oat=${ANDROID_PRODUCT_OUT}/system/framework/$TEST_NAME.oat \
+ --boot-image=${ANDROID_PRODUCT_OUT}/data/art-test/core.art \
+ --dex-file=${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME.jar \
+ --oat=${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME.oat \
--host-prefix=${ANDROID_PRODUCT_OUT}
if [ -r src-ex ]; then
@@ -43,13 +43,13 @@
# quick shuffle so that the stored name is "classes.dex"
mv classes.dex classes-1.dex
mv classes-ex.dex classes.dex
- zip ${ANDROID_PRODUCT_OUT}/system/framework/$TEST_NAME-ex.jar classes.dex
+ zip ${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME-ex.jar classes.dex
mv classes.dex classes-ex.dex
mv classes-1.dex classes.dex
dex2oatd -Xms16m -Xmx16m \
- --boot-image=${ANDROID_PRODUCT_OUT}/system/framework/core.art \
- --dex-file=${ANDROID_PRODUCT_OUT}/system/framework/$TEST_NAME-ex.jar \
- --oat=${ANDROID_PRODUCT_OUT}/system/framework/$TEST_NAME-ex.oat \
+ --boot-image=${ANDROID_PRODUCT_OUT}/data/art-test/core.art \
+ --dex-file=${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME-ex.jar \
+ --oat=${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME-ex.oat \
--host-prefix=${ANDROID_PRODUCT_OUT}
fi
diff --git a/test/etc/push-and-run-test-jar b/test/etc/push-and-run-test-jar
index 9b33924..c1d9250 100755
--- a/test/etc/push-and-run-test-jar
+++ b/test/etc/push-and-run-test-jar
@@ -85,19 +85,19 @@
msg "------------------------------"
if [ "$QUIET" = "n" ]; then
- adb push ${ANDROID_PRODUCT_OUT}/system/framework/$TEST_NAME.jar /system/framework
- adb push ${ANDROID_PRODUCT_OUT}/system/framework/$TEST_NAME.oat /system/framework
- adb push ${ANDROID_PRODUCT_OUT}/system/framework/$TEST_NAME.art /system/framework
- adb push ${ANDROID_PRODUCT_OUT}/system/framework/$TEST_NAME-ex.jar /system/framework
- adb push ${ANDROID_PRODUCT_OUT}/system/framework/$TEST_NAME-ex.oat /system/framework
- adb push ${ANDROID_PRODUCT_OUT}/system/framework/$TEST_NAME-ex.art /system/framework
+ adb push ${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME.jar /system/framework
+ adb push ${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME.oat /data/art-test
+ adb push ${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME.art /data/art-test
+ adb push ${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME-ex.jar /data/art-test
+ adb push ${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME-ex.oat /data/art-test
+ adb push ${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME-ex.art /data/art-test
else
- adb push ${ANDROID_PRODUCT_OUT}/system/framework/$TEST_NAME.jar /system/framework >/dev/null 2>&1
- adb push ${ANDROID_PRODUCT_OUT}/system/framework/$TEST_NAME.oat /system/framework >/dev/null 2>&1
- adb push ${ANDROID_PRODUCT_OUT}/system/framework/$TEST_NAME.art /system/framework >/dev/null 2>&1
- adb push ${ANDROID_PRODUCT_OUT}/system/framework/$TEST_NAME-ex.jar /system/framework >/dev/null 2>&1
- adb push ${ANDROID_PRODUCT_OUT}/system/framework/$TEST_NAME-ex.oat /system/framework >/dev/null 2>&1
- adb push ${ANDROID_PRODUCT_OUT}/system/framework/$TEST_NAME-ex.art /system/framework >/dev/null 2>&1
+ adb push ${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME.jar /data/art-test >/dev/null 2>&1
+ adb push ${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME.oat /data/art-test >/dev/null 2>&1
+ adb push ${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME.art /data/art-test >/dev/null 2>&1
+ adb push ${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME-ex.jar /data/art-test >/dev/null 2>&1
+ adb push ${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME-ex.oat /data/art-test >/dev/null 2>&1
+ adb push ${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME-ex.art /data/art-test >/dev/null 2>&1
fi
if [ "$DEBUG" = "y" ]; then
@@ -114,8 +114,8 @@
adb shell cd /data \; dvz -classpath $TEST_NAME.jar Main "$@"
else
cmdline="cd /data; oatexecd \
- -Ximage:/system/framework/core.art \
- -cp /system/framework/$TEST_NAME.jar \
+ -Ximage:/data/art-test/core.art \
+ -cp /data/art-test/$TEST_NAME.jar \
Main"
#cmdline="cd /data; dalvikvm $DEX_VERIFY $DEX_OPTIMIZE $DEX_DEBUG \
# $GC_OPTS -cp test.jar -Xint:${INTERP} -ea Main"
