libnativebridge: updates for Android's inclusive language guidance
Based on:
https://source.android.com/setup/contribute/respectful-code
Bug: 161896447
Bug: 161850439
Bug: 161336379
Test: treehugger
Change-Id: I11c2bc377bccb84c5ad587350c76972614262c23
diff --git a/libnativebridge/tests/Android.bp b/libnativebridge/tests/Android.bp
index fe70a06..215d08e 100644
--- a/libnativebridge/tests/Android.bp
+++ b/libnativebridge/tests/Android.bp
@@ -15,7 +15,7 @@
//
cc_defaults {
- name: "libnativebridge-dummy-defaults",
+ name: "libnativebridge-test-case-defaults",
defaults: [
"art_defaults",
"art_test_defaults",
@@ -40,37 +40,37 @@
}
cc_library_shared {
- name: "libnativebridge-dummy",
- srcs: ["DummyNativeBridge.cpp"],
- defaults: ["libnativebridge-dummy-defaults"],
+ name: "libnativebridge-test-case",
+ srcs: ["NativeBridgeTestCase.cpp"],
+ defaults: ["libnativebridge-test-case-defaults"],
}
cc_library_shared {
- name: "libnativebridge2-dummy",
- srcs: ["DummyNativeBridge2.cpp"],
- defaults: ["libnativebridge-dummy-defaults"],
+ name: "libnativebridge2-test-case",
+ srcs: ["NativeBridgeTestCase2.cpp"],
+ defaults: ["libnativebridge-test-case-defaults"],
}
cc_library_shared {
- name: "libnativebridge3-dummy",
- srcs: ["DummyNativeBridge3.cpp"],
- defaults: ["libnativebridge-dummy-defaults"],
+ name: "libnativebridge3-test-case",
+ srcs: ["NativeBridgeTestCase3.cpp"],
+ defaults: ["libnativebridge-test-case-defaults"],
}
cc_library_shared {
- name: "libnativebridge6-dummy",
- srcs: ["DummyNativeBridge6.cpp"],
- defaults: ["libnativebridge-dummy-defaults"],
+ name: "libnativebridge6-test-case",
+ srcs: ["NativeBridgeTestCase6.cpp"],
+ defaults: ["libnativebridge-test-case-defaults"],
shared_libs: [
"libnativebridge6prezygotefork",
],
}
-// A helper library to produce dummy side effect of PreZygoteForkNativeBridge.
+// A helper library to produce test-case side effect of PreZygoteForkNativeBridge.
cc_library_shared {
name: "libnativebridge6prezygotefork",
srcs: ["NativeBridge6PreZygoteFork_lib.cpp"],
- defaults: ["libnativebridge-dummy-defaults"],
+ defaults: ["libnativebridge-test-case-defaults"],
}
// Build the unit tests.
@@ -119,7 +119,7 @@
shared_libs: [
"liblog",
- "libnativebridge-dummy",
+ "libnativebridge-test-case",
"libnativebridge6prezygotefork",
],
header_libs: ["libbase_headers"],
diff --git a/libnativebridge/tests/NativeBridge2Signal_test.cpp b/libnativebridge/tests/NativeBridge2Signal_test.cpp
index 44e45e3..59baca4 100644
--- a/libnativebridge/tests/NativeBridge2Signal_test.cpp
+++ b/libnativebridge/tests/NativeBridge2Signal_test.cpp
@@ -21,7 +21,7 @@
namespace android {
-constexpr const char* kNativeBridgeLibrary2 = "libnativebridge2-dummy.so";
+constexpr const char* kNativeBridgeLibrary2 = "libnativebridge2-test-case.so";
TEST_F(NativeBridgeTest, V2_Signal) {
// Init
diff --git a/libnativebridge/tests/NativeBridge3CreateNamespace_test.cpp b/libnativebridge/tests/NativeBridge3CreateNamespace_test.cpp
index 668d942..3bcc917 100644
--- a/libnativebridge/tests/NativeBridge3CreateNamespace_test.cpp
+++ b/libnativebridge/tests/NativeBridge3CreateNamespace_test.cpp
@@ -18,7 +18,7 @@
namespace android {
-constexpr const char* kNativeBridgeLibrary3 = "libnativebridge3-dummy.so";
+constexpr const char* kNativeBridgeLibrary3 = "libnativebridge3-test-case.so";
TEST_F(NativeBridgeTest, V3_CreateNamespace) {
// Init
diff --git a/libnativebridge/tests/NativeBridge3GetError_test.cpp b/libnativebridge/tests/NativeBridge3GetError_test.cpp
index 0b9f582..b6b315d 100644
--- a/libnativebridge/tests/NativeBridge3GetError_test.cpp
+++ b/libnativebridge/tests/NativeBridge3GetError_test.cpp
@@ -18,7 +18,7 @@
namespace android {
-constexpr const char* kNativeBridgeLibrary3 = "libnativebridge3-dummy.so";
+constexpr const char* kNativeBridgeLibrary3 = "libnativebridge3-test-case.so";
TEST_F(NativeBridgeTest, V3_GetError) {
// Init
diff --git a/libnativebridge/tests/NativeBridge3InitAnonymousNamespace_test.cpp b/libnativebridge/tests/NativeBridge3InitAnonymousNamespace_test.cpp
index b0d6b09..b1855b4 100644
--- a/libnativebridge/tests/NativeBridge3InitAnonymousNamespace_test.cpp
+++ b/libnativebridge/tests/NativeBridge3InitAnonymousNamespace_test.cpp
@@ -18,7 +18,7 @@
namespace android {
-constexpr const char* kNativeBridgeLibrary3 = "libnativebridge3-dummy.so";
+constexpr const char* kNativeBridgeLibrary3 = "libnativebridge3-test-case.so";
TEST_F(NativeBridgeTest, V3_InitAnonymousNamespace) {
// Init
diff --git a/libnativebridge/tests/NativeBridge3IsPathSupported_test.cpp b/libnativebridge/tests/NativeBridge3IsPathSupported_test.cpp
index 325e40b..da9cf1c 100644
--- a/libnativebridge/tests/NativeBridge3IsPathSupported_test.cpp
+++ b/libnativebridge/tests/NativeBridge3IsPathSupported_test.cpp
@@ -18,7 +18,7 @@
namespace android {
-constexpr const char* kNativeBridgeLibrary3 = "libnativebridge3-dummy.so";
+constexpr const char* kNativeBridgeLibrary3 = "libnativebridge3-test-case.so";
TEST_F(NativeBridgeTest, V3_IsPathSupported) {
// Init
diff --git a/libnativebridge/tests/NativeBridge3LoadLibraryExt_test.cpp b/libnativebridge/tests/NativeBridge3LoadLibraryExt_test.cpp
index 4caeb44..9d037b5 100644
--- a/libnativebridge/tests/NativeBridge3LoadLibraryExt_test.cpp
+++ b/libnativebridge/tests/NativeBridge3LoadLibraryExt_test.cpp
@@ -18,7 +18,7 @@
namespace android {
-constexpr const char* kNativeBridgeLibrary3 = "libnativebridge3-dummy.so";
+constexpr const char* kNativeBridgeLibrary3 = "libnativebridge3-test-case.so";
TEST_F(NativeBridgeTest, V3_LoadLibraryExt) {
// Init
diff --git a/libnativebridge/tests/NativeBridge3UnloadLibrary_test.cpp b/libnativebridge/tests/NativeBridge3UnloadLibrary_test.cpp
index 93a979c..041fc62 100644
--- a/libnativebridge/tests/NativeBridge3UnloadLibrary_test.cpp
+++ b/libnativebridge/tests/NativeBridge3UnloadLibrary_test.cpp
@@ -18,7 +18,7 @@
namespace android {
-constexpr const char* kNativeBridgeLibrary3 = "libnativebridge3-dummy.so";
+constexpr const char* kNativeBridgeLibrary3 = "libnativebridge3-test-case.so";
TEST_F(NativeBridgeTest, V3_UnloadLibrary) {
// Init
diff --git a/libnativebridge/tests/NativeBridge6PreZygoteFork_test.cpp b/libnativebridge/tests/NativeBridge6PreZygoteFork_test.cpp
index 9e348a2..6522483 100644
--- a/libnativebridge/tests/NativeBridge6PreZygoteFork_test.cpp
+++ b/libnativebridge/tests/NativeBridge6PreZygoteFork_test.cpp
@@ -19,7 +19,7 @@
namespace android {
-constexpr const char* kNativeBridgeLibrary6 = "libnativebridge6-dummy.so";
+constexpr const char* kNativeBridgeLibrary6 = "libnativebridge6-test-case.so";
TEST_F(NativeBridgeTest, V6_PreZygoteFork) {
// Init
diff --git a/libnativebridge/tests/NativeBridgeTest.h b/libnativebridge/tests/NativeBridgeTest.h
index cc79907..cd0fd01 100644
--- a/libnativebridge/tests/NativeBridgeTest.h
+++ b/libnativebridge/tests/NativeBridgeTest.h
@@ -22,11 +22,11 @@
#include <nativebridge/native_bridge.h>
#include <gtest/gtest.h>
-constexpr const char* kNativeBridgeLibrary = "libnativebridge-dummy.so";
+constexpr const char* kNativeBridgeLibrary = "libnativebridge-test-case.so";
constexpr const char* kCodeCache = "./code_cache";
constexpr const char* kCodeCacheStatFail = "./code_cache/temp";
-constexpr const char* kNativeBridgeLibrary2 = "libnativebridge2-dummy.so";
-constexpr const char* kNativeBridgeLibrary3 = "libnativebridge3-dummy.so";
+constexpr const char* kNativeBridgeLibrary2 = "libnativebridge2-test-case.so";
+constexpr const char* kNativeBridgeLibrary3 = "libnativebridge3-test-case.so";
namespace android {
diff --git a/libnativebridge/tests/DummyNativeBridge.cpp b/libnativebridge/tests/NativeBridgeTestCase.cpp
similarity index 96%
rename from libnativebridge/tests/DummyNativeBridge.cpp
rename to libnativebridge/tests/NativeBridgeTestCase.cpp
index b9894f6..234c70e 100644
--- a/libnativebridge/tests/DummyNativeBridge.cpp
+++ b/libnativebridge/tests/NativeBridgeTestCase.cpp
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-// A dummy implementation of the native-bridge interface.
+// An implementation of the native-bridge interface for testing.
#include "nativebridge/native_bridge.h"
diff --git a/libnativebridge/tests/DummyNativeBridge2.cpp b/libnativebridge/tests/NativeBridgeTestCase2.cpp
similarity index 92%
rename from libnativebridge/tests/DummyNativeBridge2.cpp
rename to libnativebridge/tests/NativeBridgeTestCase2.cpp
index 6920c74..3c75ebf 100644
--- a/libnativebridge/tests/DummyNativeBridge2.cpp
+++ b/libnativebridge/tests/NativeBridgeTestCase2.cpp
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-// A dummy implementation of the native-bridge interface.
+// An implementation of the native-bridge interface for testing.
#include "nativebridge/native_bridge.h"
@@ -50,7 +50,7 @@
return version <= 2;
}
-static bool native_bridge2_dummy_signal_handler(int, siginfo_t*, void*) {
+static bool native_bridge2_test_case_signal_handler(int, siginfo_t*, void*) {
// TODO: Implement something here. We'd either have to have a death test with a log here, or
// we'd have to be able to resume after the faulting instruction...
return true;
@@ -58,7 +58,7 @@
extern "C" android::NativeBridgeSignalHandlerFn native_bridge2_get_signal_handler(int signal) {
if (signal == SIGSEGV) {
- return &native_bridge2_dummy_signal_handler;
+ return &native_bridge2_test_case_signal_handler;
}
return nullptr;
}
diff --git a/libnativebridge/tests/DummyNativeBridge3.cpp b/libnativebridge/tests/NativeBridgeTestCase3.cpp
similarity index 95%
rename from libnativebridge/tests/DummyNativeBridge3.cpp
rename to libnativebridge/tests/NativeBridgeTestCase3.cpp
index 4ef1c82..c5bd032 100644
--- a/libnativebridge/tests/DummyNativeBridge3.cpp
+++ b/libnativebridge/tests/NativeBridgeTestCase3.cpp
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-// A dummy implementation of the native-bridge interface.
+// An implementation of the native-bridge interface for testing.
#include "nativebridge/native_bridge.h"
@@ -51,7 +51,7 @@
return version <= 3;
}
-static bool native_bridge3_dummy_signal_handler(int, siginfo_t*, void*) {
+static bool native_bridge3_test_case_signal_handler(int, siginfo_t*, void*) {
// TODO: Implement something here. We'd either have to have a death test with a log here, or
// we'd have to be able to resume after the faulting instruction...
return true;
@@ -59,7 +59,7 @@
extern "C" android::NativeBridgeSignalHandlerFn native_bridge3_getSignalHandler(int signal) {
if (signal == SIGSEGV) {
- return &native_bridge3_dummy_signal_handler;
+ return &native_bridge3_test_case_signal_handler;
}
return nullptr;
}
diff --git a/libnativebridge/tests/DummyNativeBridge6.cpp b/libnativebridge/tests/NativeBridgeTestCase6.cpp
similarity index 98%
rename from libnativebridge/tests/DummyNativeBridge6.cpp
rename to libnativebridge/tests/NativeBridgeTestCase6.cpp
index ce27e67..2b9fba5 100644
--- a/libnativebridge/tests/DummyNativeBridge6.cpp
+++ b/libnativebridge/tests/NativeBridgeTestCase6.cpp
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-// A dummy implementation of the native-bridge interface.
+// An implementation of the native-bridge interface for testing.
#include "nativebridge/native_bridge.h"