Revert "Minimal hiddenapibypass breakage demo."

Revert submission 3452451-hiddenapibypass-break

Reason for revert: b/390327923

Reverted changes: /q/submissionid:3452451-hiddenapibypass-break

Change-Id: I8f296db894fc794906a01ff38336b1cf38e2eba4

2 files changed, 0 insertions, 5 deletions

diff --git a/runtime/class_linker_test.cc b/runtime/class_linker_test.cc
index 1176bb133e..8ae7687433 100644
--- a/runtime/class_linker_test.cc
+++ b/runtime/class_linker_test.cc
@@ -786,8 +786,6 @@ struct MethodHandleOffsets : public CheckOffsets<mirror::MethodHandle> {
 struct MethodHandleImplOffsets : public CheckOffsets<mirror::MethodHandleImpl> {
   MethodHandleImplOffsets() : CheckOffsets<mirror::MethodHandleImpl>(
       false, "Ljava/lang/invoke/MethodHandleImpl;") {
-    addOffset(OFFSETOF_MEMBER(mirror::MethodHandleImpl, field_), "field");
-    addOffset(OFFSETOF_MEMBER(mirror::MethodHandleImpl, target_), "target");
     addOffset(OFFSETOF_MEMBER(mirror::MethodHandleImpl, target_class_or_info_),
               "targetClassOrMethodHandleInfo");
   }
diff --git a/runtime/mirror/method_handle_impl.h b/runtime/mirror/method_handle_impl.h
index b5d1d9ad25..427a20013e 100644
--- a/runtime/mirror/method_handle_impl.h
+++ b/runtime/mirror/method_handle_impl.h
@@ -22,7 +22,6 @@
 #include "base/macros.h"
 #include "class.h"
 #include "method_type.h"
-#include "mirror/field.h"
 #include "obj_ptr.h"
 #include "object.h"
 
@@ -129,9 +128,7 @@ class MANAGED MethodHandleImpl : public MethodHandle {
       REQUIRES_SHARED(Locks::mutator_lock_) REQUIRES(!Roles::uninterruptible_);
 
  private:
-  HeapReference<mirror::Field> field_;
   HeapReference<mirror::Object> target_class_or_info_;  // Unused by the runtime.
-  uint64_t target_;
 
   friend struct art::MethodHandleImplOffsets;  // for verifying offset information
   DISALLOW_IMPLICIT_CONSTRUCTORS(MethodHandleImpl);