summaryrefslogtreecommitdiff
path: root/runtime/common_runtime_test.h
diff options
context:
space:
mode:
author Martin Stjernholm <mast@google.com> 2020-10-15 16:03:29 +0100
committer Martin Stjernholm <mast@google.com> 2020-10-20 15:08:20 +0000
commit9fde2db3d4cfc6d7d1520454abc2aa4622a073ea (patch)
tree24b984d2761b8b42df31e25949ce8d2d6f33bdc6 /runtime/common_runtime_test.h
parentf50975ab491fa962e6e5ec4405fdb31591d51d96 (diff)
Update host tests to point to a dedicated boot image directory.
On device the boot image files are in the APEX, but on host they're created by the global code in dexpreopt_config.go and installed by make in the same location irrespective of the ART APEX in use (release or debug). That location is now moved to $(ANDROID_HOST_OUT)/apex/art_boot_images to avoid conflict with the APEX paths (because the release APEX is moving from com.android.art.release to com.android.art). Test: art/test/testrunner/run_build_test_target.py art-test Test: art/build/apex/runtests.sh Test: art/tools/buildbot-build.sh {--host,--target} Test: art/tools/run-gtests.sh Test: m test-art-host-gtest Test: art/test/testrunner/testrunner.py --target --64 --optimizing Test: m build-art-target-golem Bug: 169639321 Change-Id: I932a15539e170d3c6c78515b22dd4b91ce1c57b4
Diffstat (limited to 'runtime/common_runtime_test.h')
-rw-r--r--runtime/common_runtime_test.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/runtime/common_runtime_test.h b/runtime/common_runtime_test.h
index 47031a3327..cc23620a54 100644
--- a/runtime/common_runtime_test.h
+++ b/runtime/common_runtime_test.h
@@ -205,7 +205,6 @@ class CommonRuntimeTestImpl : public CommonArtTestImpl {
virtual void FinalizeSetup();
// Returns the directory where the pre-compiled boot.art can be found.
- static std::string GetImageDirectory();
static std::string GetImageLocation();
static std::string GetSystemImageFile();