From 1d1d25eea72cf22aed802352a82588d97403f7b6 Mon Sep 17 00:00:00 2001 From: Mythri Alle Date: Mon, 4 Jul 2022 12:00:14 +0000 Subject: Revert "Reland "Don't use instrumentation stubs for native methods in debuggable"" This reverts commit 6fb0acc14459a856c35b642e3368aff853259260. Reason for revert: Breaks android.jvmti.cts.JvmtiHostTest https://buganizer.corp.google.com/issues/237991413 Change-Id: I00fb58080693ddebc03c7b62ea67c91150ef7a21 --- tools/cpp-define-generator/runtime.def | 6 ------ 1 file changed, 6 deletions(-) (limited to 'tools/cpp-define-generator/runtime.def') diff --git a/tools/cpp-define-generator/runtime.def b/tools/cpp-define-generator/runtime.def index 4407e0c2b6..2a2e303ba2 100644 --- a/tools/cpp-define-generator/runtime.def +++ b/tools/cpp-define-generator/runtime.def @@ -30,9 +30,3 @@ ASM_DEFINE(RUNTIME_SAVE_REFS_AND_ARGS_METHOD_OFFSET, art::Runtime::GetCalleeSaveMethodOffset(art::CalleeSaveType::kSaveRefsAndArgs)) ASM_DEFINE(RUNTIME_SAVE_REFS_ONLY_METHOD_OFFSET, art::Runtime::GetCalleeSaveMethodOffset(art::CalleeSaveType::kSaveRefsOnly)) -ASM_DEFINE(RUNTIME_INSTRUMENTATION_OFFSET, art::Runtime::GetInstrumentationOffset().Int32Value()) -ASM_DEFINE(INSTRUMENTATION_STUBS_INSTALLED_OFFSET, - art::instrumentation::Instrumentation::NeedsEntryExitHooksOffset().Int32Value()) -ASM_DEFINE(INSTRUMENTATION_STUBS_INSTALLED_OFFSET_FROM_RUNTIME_INSTANCE, - art::Runtime::GetInstrumentationOffset().Int32Value() + - art::instrumentation::Instrumentation::NeedsEntryExitHooksOffset().Int32Value()) -- cgit v1.2.3-59-g8ed1b