diff options
Diffstat (limited to 'libartbase/base/file_utils.cc')
| -rw-r--r-- | libartbase/base/file_utils.cc | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/libartbase/base/file_utils.cc b/libartbase/base/file_utils.cc index cb2aee2979..0573e9037b 100644 --- a/libartbase/base/file_utils.cc +++ b/libartbase/base/file_utils.cc @@ -83,6 +83,8 @@ static constexpr const char* kAndroidSystemExtRootEnvVar = "SYSTEM_EXT_ROOT"; static constexpr const char* kAndroidSystemExtRootDefaultPath = "/system_ext"; static constexpr const char* kAndroidDataEnvVar = "ANDROID_DATA"; static constexpr const char* kAndroidDataDefaultPath = "/data"; +static constexpr const char* kAndroidExpandEnvVar = "ANDROID_EXPAND"; +static constexpr const char* kAndroidExpandDefaultPath = "/mnt/expand"; static constexpr const char* kAndroidArtRootEnvVar = "ANDROID_ART_ROOT"; static constexpr const char* kAndroidConscryptRootEnvVar = "ANDROID_CONSCRYPT_ROOT"; static constexpr const char* kAndroidI18nRootEnvVar = "ANDROID_I18N_ROOT"; @@ -293,6 +295,18 @@ std::string GetAndroidDataSafe(std::string* error_msg) { std::string GetAndroidData() { return GetAndroidDir(kAndroidDataEnvVar, kAndroidDataDefaultPath); } +std::string GetAndroidExpandSafe(std::string* error_msg) { + const char* android_dir = GetAndroidDirSafe(kAndroidExpandEnvVar, + kAndroidExpandDefaultPath, + /*must_exist=*/true, + error_msg); + return (android_dir != nullptr) ? android_dir : ""; +} + +std::string GetAndroidExpand() { + return GetAndroidDir(kAndroidExpandEnvVar, kAndroidExpandDefaultPath); +} + std::string GetArtApexData() { return GetAndroidDir(kArtApexDataEnvVar, kArtApexDataDefaultPath, /*must_exist=*/false); } |