commit 5eb7ad2aac1f0e1690c5f8213528a3cb8b820e16
author Mythri Alle <mythria@google.com> Tue Jul 05 12:44:52 2022 +0000
committer Mythri Alle <mythria@google.com> Wed Jul 06 09:03:29 2022 +0000
tree bb4437360bd53b3ae672c86b885af3a4e79b7099
parent 3c37682612903a0eae8632274cd5c9bf4de37cc3

Reland^2 "Don't use instrumentation stubs for native methods in debuggable"

This reverts commit 1d1d25eea72cf22aed802352a82588d97403f7b6.

Reason for revert: Relanding after fix to failures:
https://android-review.googlesource.com/c/platform/cts/+/2145979

Bug: 206029744

Change-Id: Id3c7508c86f9aeb0ddfc1c4792ed54f003b88e77

tools/cpp-define-generator/runtime.def

diff --git a/tools/cpp-define-generator/runtime.def b/tools/cpp-define-generator/runtime.def
index 2a2e303..4407e0c 100644
--- a/tools/cpp-define-generator/runtime.def
+++ b/tools/cpp-define-generator/runtime.def
@@ -30,3 +30,9 @@
            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())