summaryrefslogtreecommitdiff
path: root/runtime/hidden_api.cc
diff options
context:
space:
mode:
author Chris Gross <chrisgross@google.com> 2020-04-24 09:36:45 -0700
committer Chris Gross <chrisgross@google.com> 2020-05-05 21:12:37 +0000
commit5477b8e55f01a58fac188f272818b38a19c50d4e (patch)
treee6e345925412d7bd3f6f1e46d9c47833c23bdb40 /runtime/hidden_api.cc
parented2895678203365b2024c742f51d34791729900b (diff)
Allow bootjars in system_ext.
Bug: 148385042 Test: Built and booted Pixel 3a both with and without a boot jar in system_ext. Test: m test-art-host-gtest-hidden_api_test32 Test: m test-art-host-gtest-hidden_api_test64 Change-Id: I10ef0340b92aa60579ff39f888cb556dc2953f2a
Diffstat (limited to 'runtime/hidden_api.cc')
-rw-r--r--runtime/hidden_api.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/runtime/hidden_api.cc b/runtime/hidden_api.cc
index 6ac57b61f7..86c38c2e99 100644
--- a/runtime/hidden_api.cc
+++ b/runtime/hidden_api.cc
@@ -107,6 +107,10 @@ static Domain DetermineDomainFromLocation(const std::string& dex_location,
return Domain::kPlatform;
}
+ if (LocationIsOnSystemExtFramework(dex_location.c_str())) {
+ return Domain::kPlatform;
+ }
+
if (class_loader.IsNull()) {
LOG(WARNING) << "DexFile " << dex_location
<< " is in boot class path but is not in a known location";