Revert^3 "Add bss support for inlining BCP DexFiles for single image"

This reverts commit b740438513307629491c575dbf895bbbf215f77c.

Reason for revert: armv7 debug failures

Change-Id: I64dd914a66b3f3472b48cc27e1d1aa6117e8aba7

1 files changed, 3 insertions, 8 deletions

diff --git a/runtime/entrypoints/entrypoint_utils.h b/runtime/entrypoints/entrypoint_utils.h
index 8b6fc69bea..5faf387093 100644
--- a/runtime/entrypoints/entrypoint_utils.h
+++ b/runtime/entrypoints/entrypoint_utils.h
@@ -213,14 +213,9 @@ bool NeedsClinitCheckBeforeCall(ArtMethod* method) REQUIRES_SHARED(Locks::mutato
 ObjPtr<mirror::Object> GetGenericJniSynchronizationObject(Thread* self, ArtMethod* called)
     REQUIRES_SHARED(Locks::mutator_lock_);
 
-// Update .bss method entrypoint if the `outer_method` has a valid OatFile, and either
-//   A) the `callee_reference` has the same OatFile as `outer_method`, or
-//   B) the `callee_reference` comes from a BCP DexFile that was present during `outer_method`'s
-//      OatFile compilation.
-// In both cases, we require that the oat file has a .bss entry for the `callee_reference`.
-void MaybeUpdateBssMethodEntry(ArtMethod* callee,
-                               MethodReference callee_reference,
-                               ArtMethod* outer_method) REQUIRES_SHARED(Locks::mutator_lock_);
+// Update .bss method entrypoint if the `callee_reference` has an associated oat file
+// and that oat file has a .bss entry for the `callee_reference`.
+void MaybeUpdateBssMethodEntry(ArtMethod* callee, MethodReference callee_reference);
 
 }  // namespace art