From 1aa5d121d7eb21a96f42cfd396e56bf2acdca162 Mon Sep 17 00:00:00 2001 From: dimitry Date: Wed, 2 Aug 2023 22:26:34 +0200 Subject: nativebridge: Add getTrampoline2 function to pass JNICallType NativeBridge needs to know if JNI call is @CriticalNative, starting with v7 getTrampoline2 is used in place of getTrampoline. Bug: https://issuetracker.google.com/288392666 Test: art/libnativebridge/tests/runtests.sh --skip-target Change-Id: I60a2fd6ab2fb9d19dda7bbdcbe09144797bd1d49 --- .../tests/NativeBridge7CriticalNative_lib.h | 35 ++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 libnativebridge/tests/NativeBridge7CriticalNative_lib.h (limited to 'libnativebridge/tests/NativeBridge7CriticalNative_lib.h') diff --git a/libnativebridge/tests/NativeBridge7CriticalNative_lib.h b/libnativebridge/tests/NativeBridge7CriticalNative_lib.h new file mode 100644 index 0000000000..5a7594b203 --- /dev/null +++ b/libnativebridge/tests/NativeBridge7CriticalNative_lib.h @@ -0,0 +1,35 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef ART_LIBNATIVEBRIDGE_TESTS_NATIVEBRIDGE7CRITICALNATIVE_LIB_H_ +#define ART_LIBNATIVEBRIDGE_TESTS_NATIVEBRIDGE7CRITICALNATIVE_LIB_H_ + +#include "nativebridge/native_bridge.h" + +namespace android { + +void ResetTrampolineCalledState(); + +void SetLegacyGetTrampolineCalled(); +bool IsLegacyGetTrampolineCalled(); + +void SetGetTrampoline2Called(JNICallType jni_call_type); +bool IsGetTrampoline2Called(); +JNICallType GetTrampoline2JNICallType(); + +} // namespace android + +#endif // ART_LIBNATIVEBRIDGE_TESTS_NATIVEBRIDGE7CRITICALNATIVE_LIB_H_ -- cgit v1.2.3-59-g8ed1b