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/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