Revert^2 "Add hooks in palette for reporting JNI invocations."
Test: test.py
Bug: 140968481
Change-Id: I3ebbec153040b9bcfe4fb86618c15d2f9c93abb6
diff --git a/runtime/entrypoints/quick/quick_entrypoints.h b/runtime/entrypoints/quick/quick_entrypoints.h
index d9fbbc7..d41a276 100644
--- a/runtime/entrypoints/quick/quick_entrypoints.h
+++ b/runtime/entrypoints/quick/quick_entrypoints.h
@@ -79,6 +79,28 @@
jobject locked, Thread* self)
NO_THREAD_SAFETY_ANALYSIS HOT_ATTR;
+// JNI entrypoints when monitoring entry/exit.
+extern uint32_t JniMonitoredMethodStart(Thread* self) NO_THREAD_SAFETY_ANALYSIS HOT_ATTR;
+extern uint32_t JniMonitoredMethodStartSynchronized(jobject to_lock, Thread* self)
+ NO_THREAD_SAFETY_ANALYSIS HOT_ATTR;
+extern void JniMonitoredMethodEnd(uint32_t saved_local_ref_cookie, Thread* self)
+ NO_THREAD_SAFETY_ANALYSIS HOT_ATTR;
+extern void JniMonitoredMethodEndSynchronized(uint32_t saved_local_ref_cookie,
+ jobject locked,
+ Thread* self)
+ NO_THREAD_SAFETY_ANALYSIS HOT_ATTR;
+extern mirror::Object* JniMonitoredMethodEndWithReference(jobject result,
+ uint32_t saved_local_ref_cookie,
+ Thread* self)
+ NO_THREAD_SAFETY_ANALYSIS HOT_ATTR;
+
+extern mirror::Object* JniMonitoredMethodEndWithReferenceSynchronized(
+ jobject result,
+ uint32_t saved_local_ref_cookie,
+ jobject locked, Thread* self)
+ NO_THREAD_SAFETY_ANALYSIS HOT_ATTR;
+
+
extern "C" mirror::String* artStringBuilderAppend(uint32_t format,
const uint32_t* args,
Thread* self)
@@ -88,7 +110,6 @@
Thread* self)
NO_THREAD_SAFETY_ANALYSIS HOT_ATTR;
-
// Read barrier entrypoints.
//
// Compilers for ARM, ARM64 can insert a call to these