summaryrefslogtreecommitdiff
path: root/runtime/class_linker.cc
diff options
context:
space:
mode:
author Jiakai Zhang <jiakaiz@google.com> 2021-10-11 05:04:34 +0000
committer Jiakai Zhang <jiakaiz@google.com> 2021-10-15 13:03:49 +0000
commitebf496f245dec69af6abfa115aa0e5872aee93d1 (patch)
tree4d90ed1ea13dc04c364e1f75de45098cc1b2333b /runtime/class_linker.cc
parent0d0d91a2acd58696366021982279bacc6638b123 (diff)
Deprecate --updatable-bcp-packages-fd and --updatable-bcp-packages-file
These flags are no longer needed and therefore deprecated. They are still kept for compatibility, but they do not take any effect now. Bug: 200241946 Test: Presubmits Change-Id: I17b937e382cd3fe6eb20f2a686a638492c93d58e
Diffstat (limited to 'runtime/class_linker.cc')
-rw-r--r--runtime/class_linker.cc18
1 files changed, 0 insertions, 18 deletions
diff --git a/runtime/class_linker.cc b/runtime/class_linker.cc
index df5038721c..454a20fa11 100644
--- a/runtime/class_linker.cc
+++ b/runtime/class_linker.cc
@@ -3054,18 +3054,6 @@ ObjPtr<mirror::Class> ClassLinker::DefineClass(Thread* self,
}
}
- // For AOT-compilation of an app, we may use a shortened boot class path that excludes
- // some runtime modules. Prevent definition of classes in app class loader that could clash
- // with these modules as these classes could be resolved differently during execution.
- if (class_loader != nullptr &&
- Runtime::Current()->IsAotCompiler() &&
- IsUpdatableBootClassPathDescriptor(descriptor)) {
- ObjPtr<mirror::Throwable> pre_allocated =
- Runtime::Current()->GetPreAllocatedNoClassDefFoundError();
- self->SetException(pre_allocated);
- return sdc.Finish(nullptr);
- }
-
// For AOT-compilation of an app, we may use only a public SDK to resolve symbols. If the SDK
// checks are configured (a non null SdkChecker) and the descriptor is not in the provided
// public class path then we prevent the definition of the class.
@@ -10117,12 +10105,6 @@ ObjPtr<mirror::IfTable> ClassLinker::AllocIfTable(Thread* self, size_t ifcount)
ifcount * mirror::IfTable::kMax)));
}
-bool ClassLinker::IsUpdatableBootClassPathDescriptor(const char* descriptor ATTRIBUTE_UNUSED) {
- // Should not be called on ClassLinker, only on AotClassLinker that overrides this.
- LOG(FATAL) << "UNREACHABLE";
- UNREACHABLE();
-}
-
bool ClassLinker::DenyAccessBasedOnPublicSdk(ArtMethod* art_method ATTRIBUTE_UNUSED) const
REQUIRES_SHARED(Locks::mutator_lock_) {
// Should not be called on ClassLinker, only on AotClassLinker that overrides this.