diff options
author | 2019-03-15 11:35:51 +0000 | |
---|---|---|
committer | 2019-03-16 07:34:43 +0000 | |
commit | bfaba288427e80e7941e49c4264ba8f6cd6d97d1 (patch) | |
tree | db8e893b87c2406275c82599d43e9b9a5b0f895c /libartbase/base/file_utils.h | |
parent | 7dd0f0f2b4af0b15389ca8624bde93e1fb7ed776 (diff) |
Fix buildbots hidden_api_test
Target buildbots set /system to be the runtime module root because they
are running without an apex. The test assumes that /system dex files are assigned
to the application domain but here they get assigned to the core-platform domain.
Adjust the domain setting logic to check if the runtime module root is
distict from the android root (as a proxy for 'is running with apex').
If not (as is the case with the buildbots), skip checks against apex
locations.
Test: m test-art-target-gtest-hidden_api_test
Change-Id: Iff3890ec69cb04a1e4ed5bc2a3b5c652ada05f36
Diffstat (limited to 'libartbase/base/file_utils.h')
-rw-r--r-- | libartbase/base/file_utils.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libartbase/base/file_utils.h b/libartbase/base/file_utils.h index 1da19c840d..c5e55d1ffb 100644 --- a/libartbase/base/file_utils.h +++ b/libartbase/base/file_utils.h @@ -90,6 +90,10 @@ bool LocationIsOnSystemFramework(const char* location); // Return whether the location is on /apex/. bool LocationIsOnApex(const char* location); +// Compare the runtime 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'. +bool RuntimeModuleRootDistinctFromAndroidRoot(); + // dup(2), except setting the O_CLOEXEC flag atomically, when possible. int DupCloexec(int fd); |