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_test.cpp | 53 ++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 libnativebridge/tests/NativeBridge7CriticalNative_test.cpp (limited to 'libnativebridge/tests/NativeBridge7CriticalNative_test.cpp') diff --git a/libnativebridge/tests/NativeBridge7CriticalNative_test.cpp b/libnativebridge/tests/NativeBridge7CriticalNative_test.cpp new file mode 100644 index 0000000000..0d9f8bdc3a --- /dev/null +++ b/libnativebridge/tests/NativeBridge7CriticalNative_test.cpp @@ -0,0 +1,53 @@ +/* + * 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. + */ + +#include "NativeBridge7CriticalNative_lib.h" +#include "NativeBridgeTest.h" + +namespace android { + +TEST_F(NativeBridgeTest, V7_CriticalNative) { + // Init + ASSERT_TRUE(LoadNativeBridge(kNativeBridgeLibrary7, nullptr)); + ASSERT_TRUE(NativeBridgeAvailable()); + ASSERT_TRUE(PreInitializeNativeBridge(".", "isa")); + ASSERT_TRUE(NativeBridgeAvailable()); + ASSERT_TRUE(InitializeNativeBridge(nullptr, nullptr)); + ASSERT_TRUE(NativeBridgeAvailable()); + + ASSERT_EQ(NativeBridgeGetVersion(), 7U); + + ASSERT_FALSE(IsGetTrampoline2Called()); + ASSERT_FALSE(IsLegacyGetTrampolineCalled()); + + EXPECT_EQ(NativeBridgeGetTrampoline(nullptr, "symbol", "shorty", 6), nullptr); + ASSERT_FALSE(IsLegacyGetTrampolineCalled()); + ASSERT_TRUE(IsGetTrampoline2Called()); + EXPECT_EQ(GetTrampoline2JNICallType(), kJNICallTypeRegular); + + ResetTrampolineCalledState(); + + ASSERT_FALSE(IsGetTrampoline2Called()); + ASSERT_FALSE(IsLegacyGetTrampolineCalled()); + + EXPECT_EQ(NativeBridgeGetTrampoline2(nullptr, "symbol", "shorty", 6, kJNICallTypeCriticalNative), + nullptr); + ASSERT_FALSE(IsLegacyGetTrampolineCalled()); + ASSERT_TRUE(IsGetTrampoline2Called()); + EXPECT_EQ(GetTrampoline2JNICallType(), kJNICallTypeCriticalNative); +} + +} // namespace android -- cgit v1.2.3-59-g8ed1b