diff options
Diffstat (limited to 'libnativebridge')
| -rw-r--r-- | libnativebridge/Android.bp | 1 | ||||
| -rw-r--r-- | libnativebridge/OWNERS | 2 | ||||
| -rw-r--r-- | libnativebridge/include/nativebridge/native_bridge.h | 2 | ||||
| -rw-r--r-- | libnativebridge/libnativebridge.map.txt | 12 | ||||
| -rw-r--r-- | libnativebridge/tests/Android.bp | 14 | ||||
| -rw-r--r-- | libnativebridge/tests/PreInitializeNativeBridge_test.cpp | 4 |
6 files changed, 12 insertions, 23 deletions
diff --git a/libnativebridge/Android.bp b/libnativebridge/Android.bp index 356a1f4b48..dc19f07b9f 100644 --- a/libnativebridge/Android.bp +++ b/libnativebridge/Android.bp @@ -45,6 +45,7 @@ art_cc_library { apex_available: [ "com.android.art", "com.android.art.debug", + "test_broken_com.android.art", ], host_supported: true, diff --git a/libnativebridge/OWNERS b/libnativebridge/OWNERS index daf87f47b1..71f76a6c83 100644 --- a/libnativebridge/OWNERS +++ b/libnativebridge/OWNERS @@ -1,3 +1,5 @@ +# Bug component: 86431 +mast@google.com dimitry@google.com eaeltsin@google.com ngeoffray@google.com diff --git a/libnativebridge/include/nativebridge/native_bridge.h b/libnativebridge/include/nativebridge/native_bridge.h index 2199bab552..5904c0fe3f 100644 --- a/libnativebridge/include/nativebridge/native_bridge.h +++ b/libnativebridge/include/nativebridge/native_bridge.h @@ -40,7 +40,7 @@ struct NativeBridgeRuntimeValues; // Function pointer type for sigaction. This is mostly the signature of a signal handler, except // for the return type. The runtime needs to know whether the signal was handled or should be given // to the chain. -typedef bool (*NativeBridgeSignalHandlerFn)(int, siginfo_t*, void*); +typedef bool (*NativeBridgeSignalHandlerFn)(int, siginfo_t*, void*); // NOLINT // Open the native bridge, if any. Should be called by Runtime::Init(). A null library filename // signals that we do not want to load a native bridge. diff --git a/libnativebridge/libnativebridge.map.txt b/libnativebridge/libnativebridge.map.txt index 8b51ab893a..52d06eb60a 100644 --- a/libnativebridge/libnativebridge.map.txt +++ b/libnativebridge/libnativebridge.map.txt @@ -20,12 +20,12 @@ # that defines the exported interface. Please keep in sync with this list. LIBNATIVEBRIDGE_1 { global: - NativeBridgeGetError; - NativeBridgeInitialized; - NativeBridgeGetTrampoline; - PreInitializeNativeBridge; - NativeBridgeAvailable; - NeedsNativeBridge; + NativeBridgeGetError; # apex + NativeBridgeInitialized; # apex + NativeBridgeGetTrampoline; # apex + PreInitializeNativeBridge; # apex + NativeBridgeAvailable; # apex + NeedsNativeBridge; # apex local: *; }; diff --git a/libnativebridge/tests/Android.bp b/libnativebridge/tests/Android.bp index 4d86d9e708..f1725fc278 100644 --- a/libnativebridge/tests/Android.bp +++ b/libnativebridge/tests/Android.bp @@ -183,20 +183,6 @@ cc_test { ], header_libs: ["libbase_headers"], - // Support multilib variants (using different suffix per sub-architecture), - // which is needed on build targets with secondary architectures, as the CTS - // test suite packaging logic flattens all test artifacts into a single - // `testcases` directory. - compile_multilib: "both", - multilib: { - lib32: { - suffix: "32", - }, - lib64: { - suffix: "64", - }, - }, - test_config_template: ":art-gtests-target-standalone-cts-template", test_suites: [ "cts", diff --git a/libnativebridge/tests/PreInitializeNativeBridge_test.cpp b/libnativebridge/tests/PreInitializeNativeBridge_test.cpp index 149b05ed7c..98ef30f11b 100644 --- a/libnativebridge/tests/PreInitializeNativeBridge_test.cpp +++ b/libnativebridge/tests/PreInitializeNativeBridge_test.cpp @@ -39,7 +39,7 @@ TEST_F(NativeBridgeTest, PreInitializeNativeBridge) { // Try to create our mount namespace. if (unshare(CLONE_NEWNS) != -1) { // Create a placeholder file. - FILE* cpuinfo = fopen("./cpuinfo", "w"); + FILE* cpuinfo = fopen("./cpuinfo", "we"); ASSERT_NE(nullptr, cpuinfo) << strerror(errno); fprintf(cpuinfo, kTestData); fclose(cpuinfo); @@ -47,7 +47,7 @@ TEST_F(NativeBridgeTest, PreInitializeNativeBridge) { ASSERT_TRUE(PreInitializeNativeBridge("does not matter 1", "short 2")); // Read /proc/cpuinfo - FILE* proc_cpuinfo = fopen("/proc/cpuinfo", "r"); + FILE* proc_cpuinfo = fopen("/proc/cpuinfo", "re"); ASSERT_NE(nullptr, proc_cpuinfo) << strerror(errno); char buf[1024]; EXPECT_NE(nullptr, fgets(buf, sizeof(buf), proc_cpuinfo)) << "Error reading."; |