diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2021-08-12 12:03:24 -0700 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2021-08-12 22:47:56 +0000 |
| commit | 54fd5f77b87649f8ab9b6699e064386fdceaecec (patch) | |
| tree | b27b01463388755905959e32acc9072ac333e7c0 /libartbase/base/file_utils.h | |
| parent | 029a811dcb18e54d54aca805db7f8af452798a0a (diff) | |
| parent | 7b4fead5e9441eeb9ff5a9336d500b49ffae8d97 (diff) | |
Merge ab/7633965
Bug: 169893837
Merged-In: Icb57ed5eb6b8976ecf6ac88bf8c278bbe144b450
Change-Id: I42ed1234422b6af296254d93055f9e3a69441c6c
Diffstat (limited to 'libartbase/base/file_utils.h')
| -rw-r--r-- | libartbase/base/file_utils.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libartbase/base/file_utils.h b/libartbase/base/file_utils.h index 6af82ef55d..c1b00959da 100644 --- a/libartbase/base/file_utils.h +++ b/libartbase/base/file_utils.h @@ -74,7 +74,8 @@ std::string GetArtApexData(); std::string GetDefaultBootImageLocation(std::string* error_msg); // Returns the default boot image location, based on the passed `android_root`. -std::string GetDefaultBootImageLocation(const std::string& android_root); +std::string GetDefaultBootImageLocation(const std::string& android_root, + bool deny_art_apex_data_files); // Return true if we found the dalvik cache and stored it in the dalvik_cache argument. // `have_android_data` will be set to true if we have an ANDROID_DATA that exists, @@ -152,7 +153,7 @@ bool LocationIsOnApex(std::string_view location); // Returns whether the location is trusted for loading oat files. Trusted locations are protected // by dm-verity or fs-verity. The recognized locations are on /system or // /data/misc/apexdata/com.android.art. -bool LocationIsTrusted(const std::string& location); +bool LocationIsTrusted(const std::string& location, bool trust_art_apex_data_files); // Compare the ART module root against android root. Returns true if they are // both known and distinct. This is meant to be a proxy for 'running with apex'. |