diff options
| author | 2019-09-20 15:53:40 +0100 | |
|---|---|---|
| committer | 2019-09-24 17:40:00 +0000 | |
| commit | e58624f221b967553d7b71f14d8677ceaa000553 (patch) | |
| tree | 00d6caa5ca66562d9c8e448abc77c0c6018fca0c /runtime/hidden_api.cc | |
| parent | 48349ad38887f65da76df268f8e548d508d8c6a1 (diff) | |
Various renames following the name change from "Runtime APEX" to "ART APEX".
In particular ANDROID_RUNTIME_ROOT is now ANDROID_ART_ROOT.
Test: Build & boot
Test: art/tools/run-gtests.sh in chroot
Test: art/test/testrunner/testrunner.py --target --64 in chroot
Test: art/tools/run-libcore-tests.sh --mode=device --variant=X64 in chroot
Test: art/tools/run-jdwp-tests.sh --mode=device --variant=X64 in chroot
Test: m test-art-host-gtest
Test: art/test/testrunner/testrunner.py --host --64
Test: art/tools/run-jdwp-tests.sh --mode=host
Bug: 135753770
Change-Id: Ia74da964e54cf396d66e9e12ea56da4e9483662a
Diffstat (limited to 'runtime/hidden_api.cc')
| -rw-r--r-- | runtime/hidden_api.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/runtime/hidden_api.cc b/runtime/hidden_api.cc index 388ed33dfa..98774bdf2d 100644 --- a/runtime/hidden_api.cc +++ b/runtime/hidden_api.cc @@ -76,10 +76,10 @@ static inline std::ostream& operator<<(std::ostream& os, const AccessContext& va static Domain DetermineDomainFromLocation(const std::string& dex_location, ObjPtr<mirror::ClassLoader> class_loader) { // If running with APEX, check `path` against known APEX locations. - // These checks will be skipped on target buildbots where ANDROID_RUNTIME_ROOT + // These checks will be skipped on target buildbots where ANDROID_ART_ROOT // is set to "/system". - if (RuntimeModuleRootDistinctFromAndroidRoot()) { - if (LocationIsOnRuntimeModule(dex_location.c_str()) || + if (ArtModuleRootDistinctFromAndroidRoot()) { + if (LocationIsOnArtModule(dex_location.c_str()) || LocationIsOnConscryptModule(dex_location.c_str())) { return Domain::kCorePlatform; } |