summaryrefslogtreecommitdiff
path: root/libartbase/base/common_art_test.cc
diff options
context:
space:
mode:
author Roland Levillain <rpl@google.com> 2019-03-29 20:20:16 +0000
committer Roland Levillain <rpl@google.com> 2019-04-12 13:47:09 +0100
commitfb6a5c00ef02cda7ea919d717daaf46abd0414e4 (patch)
tree9ecfaac9bee174b3b31e0294c46c4d32a5f7b714 /libartbase/base/common_art_test.cc
parentf160394fda141184f0ec3d139ec5ca810f142bda (diff)
Add and use art::GetAndroidRuntimeBinDir.
This method returns the location of the directory containing the Android Runtime binaries, which is expected to be the Android Runtime APEX's bin directory on target and the Android Root's bin directory on host (at least for now). Also remove art::CommonArtTestImpl::GetTestAndroidRoot as it is no longer used. Test: ART gtests on host and target Bug: 121117762 Change-Id: I4593bbd4d675ca9d3f7b708482aac82c1892a9ad
Diffstat (limited to 'libartbase/base/common_art_test.cc')
-rw-r--r--libartbase/base/common_art_test.cc9
1 files changed, 0 insertions, 9 deletions
diff --git a/libartbase/base/common_art_test.cc b/libartbase/base/common_art_test.cc
index 242db428d5..afdb733035 100644
--- a/libartbase/base/common_art_test.cc
+++ b/libartbase/base/common_art_test.cc
@@ -400,15 +400,6 @@ std::string CommonArtTestImpl::GetClassPathOption(const char* option,
return option + android::base::Join(class_path, ':');
}
-std::string CommonArtTestImpl::GetTestAndroidRoot() {
- if (IsHost()) {
- const char* host_dir = getenv("ANDROID_HOST_OUT");
- CHECK(host_dir != nullptr);
- return host_dir;
- }
- return GetAndroidRoot();
-}
-
// Check that for target builds we have ART_TARGET_NATIVETEST_DIR set.
#ifdef ART_TARGET
#ifndef ART_TARGET_NATIVETEST_DIR