Revert "Revert "Revert "Add a script for running art standalone."""
This reverts commit 4b23250f4cbf3047924c646c1a0c078394f8362d.
Change-Id: Ib749a8267abf35e51552b741ba749d6ed6975f95
diff --git a/runtime/gc/space/image_space.cc b/runtime/gc/space/image_space.cc
index 1af481d..ebad8dd 100644
--- a/runtime/gc/space/image_space.cc
+++ b/runtime/gc/space/image_space.cc
@@ -286,8 +286,6 @@
down_cast<mirror::String*>(image_header.GetImageRoot(ImageHeader::kOatLocation));
std::string oat_filename;
oat_filename += runtime->GetHostPrefix();
- // Ensure the path ends with a '/'.
- if (!oat_filename.empty()) oat_filename += "/";
oat_filename += oat_location->ToModifiedUtf8();
OatFile* oat_file = OatFile::Open(oat_filename, oat_filename, image_header.GetOatDataBegin(),
!Runtime::Current()->IsCompiler(), error_msg);
diff --git a/runtime/runtime.cc b/runtime/runtime.cc
index d8f9ca3..6ca45e8 100644
--- a/runtime/runtime.cc
+++ b/runtime/runtime.cc
@@ -765,12 +765,6 @@
parsed->image_ += GetAndroidRoot();
parsed->image_ += "/framework/boot.art";
}
- if (!kIsTargetBuild && parsed->host_prefix_.empty()) {
- const char* build_top = getenv("ANDROID_BUILD_TOP");
- if (build_top != NULL) {
- parsed->host_prefix_ = build_top;
- }
- }
if (parsed->heap_growth_limit_ == 0) {
parsed->heap_growth_limit_ = parsed->heap_maximum_size_;
}
@@ -840,7 +834,7 @@
bool Runtime::Start() {
VLOG(startup) << "Runtime::Start entering";
- CHECK(!kIsTargetBuild || host_prefix_.empty()) << host_prefix_;
+ CHECK(host_prefix_.empty()) << host_prefix_;
// Restore main thread state to kNative as expected by native code.
Thread* self = Thread::Current();