diff options
| author | Ian Rogers <irogers@google.com> | 2014-02-14 23:10:04 +0000 |
|---|---|---|
| committer | Ian Rogers <irogers@google.com> | 2014-02-14 23:10:04 +0000 |
| commit | 97f4489166ae31c12d35ad3f550a5fc8d143b4fa (patch) | |
| tree | 3fc0e914648425587960fb12b7369e0020015da0 /runtime | |
| parent | 4b23250f4cbf3047924c646c1a0c078394f8362d (diff) | |
| download | art-97f4489166ae31c12d35ad3f550a5fc8d143b4fa.zip art-97f4489166ae31c12d35ad3f550a5fc8d143b4fa.tar.gz art-97f4489166ae31c12d35ad3f550a5fc8d143b4fa.tar.bz2 | |
Revert "Revert "Revert "Add a script for running art standalone."""
This reverts commit 4b23250f4cbf3047924c646c1a0c078394f8362d.
Change-Id: Ib749a8267abf35e51552b741ba749d6ed6975f95
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/gc/space/image_space.cc | 2 | ||||
| -rw-r--r-- | runtime/runtime.cc | 8 |
2 files changed, 1 insertions, 9 deletions
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 @@ OatFile* ImageSpace::OpenOatFile(std::string* error_msg) const { 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 @@ Runtime::ParsedOptions* Runtime::ParsedOptions::Create(const Options& options, b 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 @@ jobject CreateSystemClassLoader() { 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(); |