From 19d1feb0fe57963e4e0931b953aa9e61b26b72c7 Mon Sep 17 00:00:00 2001 From: Martin Stjernholm Date: Tue, 30 Mar 2021 22:35:24 +0100 Subject: Avoid internal APEX stubs in libnative{bridge,loader} and clean up exported symbols. The APEX stubs don't have any practical effect on the lazy loading library wrappers. Add notes about that and update the function wrappers to keep them in sync. Also add tests for the lazy libraries. That necessitated some reshuffling in libnativeloader tests to reuse the mocks. Test: art/libnativebridge/tests/runtests.sh Test: atest libnativebridge-lazy-tests Test: atest libnativeloader_test libnativeloader_lazy_test Bug: 122710865 Change-Id: I7e291f2e84d8e35731dfb1114c9b19978ff87969 --- .../tests/libnativebridge_lazy_test.cpp | 54 ++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 libnativebridge/tests/libnativebridge_lazy_test.cpp (limited to 'libnativebridge/tests/libnativebridge_lazy_test.cpp') diff --git a/libnativebridge/tests/libnativebridge_lazy_test.cpp b/libnativebridge/tests/libnativebridge_lazy_test.cpp new file mode 100644 index 0000000000..e1d66f53df --- /dev/null +++ b/libnativebridge/tests/libnativebridge_lazy_test.cpp @@ -0,0 +1,54 @@ +/* + * Copyright (C) 2021 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 +#include + +#include "nativebridge/native_bridge.h" + +namespace android { + +class NativeBridgeLazyTest : public ::testing::Test {}; + +// The testing we can do here is limited since there's no exported API to +// actually load the native bridge, but we only need to test the trivial +// wrappers. + +TEST_F(NativeBridgeLazyTest, NeedsNativeBridge) { + EXPECT_FALSE(NeedsNativeBridge(ABI_STRING)); +} + +TEST_F(NativeBridgeLazyTest, PreInitializeNativeBridge) { + EXPECT_FALSE(PreInitializeNativeBridge(nullptr, "")); +} + +TEST_F(NativeBridgeLazyTest, NativeBridgeAvailable) { + EXPECT_FALSE(NativeBridgeAvailable()); +} + +TEST_F(NativeBridgeLazyTest, NativeBridgeInitialized) { + EXPECT_FALSE(NativeBridgeInitialized()); +} + +TEST_F(NativeBridgeLazyTest, NativeBridgeGetTrampoline) { + EXPECT_EQ(nullptr, NativeBridgeGetTrampoline(nullptr, nullptr, nullptr, 0)); +} + +TEST_F(NativeBridgeLazyTest, NativeBridgeGetError) { + EXPECT_STREQ("native bridge is not initialized", NativeBridgeGetError()); +} + +}; // namespace android -- cgit v1.2.3-59-g8ed1b