From fb6a5c00ef02cda7ea919d717daaf46abd0414e4 Mon Sep 17 00:00:00 2001 From: Roland Levillain Date: Fri, 29 Mar 2019 20:20:16 +0000 Subject: 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 --- libartbase/base/file_utils.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'libartbase/base/file_utils.h') diff --git a/libartbase/base/file_utils.h b/libartbase/base/file_utils.h index 2115e954f8..7e97ab0b9e 100644 --- a/libartbase/base/file_utils.h +++ b/libartbase/base/file_utils.h @@ -54,6 +54,9 @@ std::string GetAndroidRuntimeRoot(); // Find $ANDROID_RUNTIME_ROOT, /apex/com.android.runtime, or return an empty string. std::string GetAndroidRuntimeRootSafe(/*out*/ std::string* error_msg); +// Return the path to the directory containing the Android Runtime binaries. +std::string GetAndroidRuntimeBinDir(); + // Find $ANDROID_DATA, /data, or abort. std::string GetAndroidData(); // Find $ANDROID_DATA, /data, or return an empty string. -- cgit v1.2.3-59-g8ed1b