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 | |
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
-rw-r--r-- | Android.mk | 7 | ||||
-rw-r--r-- | runtime/gc/space/image_space.cc | 2 | ||||
-rw-r--r-- | runtime/runtime.cc | 8 | ||||
-rw-r--r-- | tools/Android.mk | 32 | ||||
-rwxr-xr-x | tools/art | 16 |
5 files changed, 2 insertions, 63 deletions
@@ -92,7 +92,6 @@ include $(art_path)/dex2oat/Android.mk include $(art_path)/disassembler/Android.mk include $(art_path)/oatdump/Android.mk include $(art_path)/dalvikvm/Android.mk -include $(art_path)/tools/Android.mk include $(art_build_path)/Android.oat.mk # ART_HOST_DEPENDENCIES depends on Android.executable.mk above for ART_HOST_EXECUTABLES @@ -301,12 +300,6 @@ build-art-host: $(ART_HOST_EXECUTABLES) $(ART_HOST_TEST_EXECUTABLES) $(HOS .PHONY: build-art-target build-art-target: $(ART_TARGET_EXECUTABLES) $(ART_TARGET_TEST_EXECUTABLES) $(TARGET_CORE_IMG_OUT) $(TARGET_OUT)/lib/libjavacore.so -.PHONY: art-host -art-host: $(HOST_OUT_EXECUTABLES)/art $(HOST_OUT)/bin/dalvikvm $(HOST_OUT)/lib/libart.so $(HOST_OUT)/bin/dex2oat $(HOST_OUT_JAVA_LIBRARIES)/core.art $(HOST_OUT)/lib/libjavacore.so - -.PHONY: art-host-debug -art-host-debug: art-host $(HOST_OUT)/lib/libartd.so $(HOST_OUT)/bin/dex2oatd - ######################################################################## # oatdump targets 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(); diff --git a/tools/Android.mk b/tools/Android.mk deleted file mode 100644 index 6c385dc..0000000 --- a/tools/Android.mk +++ /dev/null @@ -1,32 +0,0 @@ -# -# Copyright (C) 2014 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -LOCAL_PATH := $(call my-dir) - -ifeq ($(WITH_HOST_DALVIK),true) -# Copy the art shell script to the host's bin directory -include $(CLEAR_VARS) -LOCAL_IS_HOST_MODULE := true -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := EXECUTABLES -LOCAL_MODULE := art -include $(BUILD_SYSTEM)/base_rules.mk -$(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/art $(ACP) - @echo "Copy: $(PRIVATE_MODULE) ($@)" - $(copy-file-to-new-target) - $(hide) chmod 755 $@ - -endif @@ -34,22 +34,8 @@ while true; do done unset ANDROID_PRODUCT_OUT # avoid defaulting dex2oat --host-prefix to target output - -function follow_links() { - file="$1" - while [ -h "$file" ]; do - # On Mac OS, readlink -f doesn't work. - file="$(readlink "$file")" - done - echo "$file" -} - -PROG_NAME="$(follow_links "$BASH_SOURCE")" -PROG_DIR="$(cd "${PROG_NAME%/*}" ; pwd -P)" -ANDROID_BUILD_TOP="$(cd "${PROG_DIR}/../../../../" ; pwd -P)/" -ANDROID_HOST_OUT=$PROG_DIR/.. - mkdir -p /tmp/android-data/dalvik-cache +cd $ANDROID_BUILD_TOP ANDROID_DATA=/tmp/android-data \ ANDROID_ROOT=$ANDROID_HOST_OUT \ LD_LIBRARY_PATH=$ANDROID_HOST_OUT/lib \ |