summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOrion Hodson <oth@google.com>2021-05-05 18:59:19 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-05-05 18:59:19 +0000
commit6251bb3bf174b3a4ef72b73e82bd2f56f0f2c68a (patch)
tree25b6dafdcf2bb6efe4a3747a2aa313de9d887249
parenta3c392665dc68c68982ec268a5519a8b50d31e40 (diff)
parent362ce802bc270fc86cfbb113f23f175abeeea747 (diff)
downloadnative_bridge_support-6251bb3bf174b3a4ef72b73e82bd2f56f0f2c68a.tar.gz
Add stubs for renamed libnativehelper NDK API methods am: 362ce802bc
Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/native_bridge_support/+/1697234 Change-Id: I454091b979c60fd202d45666027031666dacd93f
-rw-r--r--libnativehelper/stubs_arm.cc4
-rw-r--r--libnativehelper/stubs_arm64.cc4
2 files changed, 8 insertions, 0 deletions
diff --git a/libnativehelper/stubs_arm.cc b/libnativehelper/stubs_arm.cc
index 4a9c073..1281ff3 100644
--- a/libnativehelper/stubs_arm.cc
+++ b/libnativehelper/stubs_arm.cc
@@ -19,7 +19,9 @@
DEFINE_INTERCEPTABLE_STUB_FUNCTION(AFileDescriptor_create);
DEFINE_INTERCEPTABLE_STUB_FUNCTION(AFileDescriptor_getFD);
+DEFINE_INTERCEPTABLE_STUB_FUNCTION(AFileDescriptor_getFd);
DEFINE_INTERCEPTABLE_STUB_FUNCTION(AFileDescriptor_setFD);
+DEFINE_INTERCEPTABLE_STUB_FUNCTION(AFileDescriptor_setFd);
DEFINE_INTERCEPTABLE_STUB_FUNCTION(DlCloseLibrary);
DEFINE_INTERCEPTABLE_STUB_FUNCTION(DlGetError);
DEFINE_INTERCEPTABLE_STUB_FUNCTION(DlGetSymbol);
@@ -70,7 +72,9 @@ DEFINE_INTERCEPTABLE_STUB_FUNCTION(jniUninitializeConstants);
static void __attribute__((constructor(0))) init_stub_library() {
INIT_INTERCEPTABLE_STUB_FUNCTION("libnativehelper.so", AFileDescriptor_create);
INIT_INTERCEPTABLE_STUB_FUNCTION("libnativehelper.so", AFileDescriptor_getFD);
+ INIT_INTERCEPTABLE_STUB_FUNCTION("libnativehelper.so", AFileDescriptor_getFd);
INIT_INTERCEPTABLE_STUB_FUNCTION("libnativehelper.so", AFileDescriptor_setFD);
+ INIT_INTERCEPTABLE_STUB_FUNCTION("libnativehelper.so", AFileDescriptor_setFd);
INIT_INTERCEPTABLE_STUB_FUNCTION("libnativehelper.so", DlCloseLibrary);
INIT_INTERCEPTABLE_STUB_FUNCTION("libnativehelper.so", DlGetError);
INIT_INTERCEPTABLE_STUB_FUNCTION("libnativehelper.so", DlGetSymbol);
diff --git a/libnativehelper/stubs_arm64.cc b/libnativehelper/stubs_arm64.cc
index 4a9c073..1281ff3 100644
--- a/libnativehelper/stubs_arm64.cc
+++ b/libnativehelper/stubs_arm64.cc
@@ -19,7 +19,9 @@
DEFINE_INTERCEPTABLE_STUB_FUNCTION(AFileDescriptor_create);
DEFINE_INTERCEPTABLE_STUB_FUNCTION(AFileDescriptor_getFD);
+DEFINE_INTERCEPTABLE_STUB_FUNCTION(AFileDescriptor_getFd);
DEFINE_INTERCEPTABLE_STUB_FUNCTION(AFileDescriptor_setFD);
+DEFINE_INTERCEPTABLE_STUB_FUNCTION(AFileDescriptor_setFd);
DEFINE_INTERCEPTABLE_STUB_FUNCTION(DlCloseLibrary);
DEFINE_INTERCEPTABLE_STUB_FUNCTION(DlGetError);
DEFINE_INTERCEPTABLE_STUB_FUNCTION(DlGetSymbol);
@@ -70,7 +72,9 @@ DEFINE_INTERCEPTABLE_STUB_FUNCTION(jniUninitializeConstants);
static void __attribute__((constructor(0))) init_stub_library() {
INIT_INTERCEPTABLE_STUB_FUNCTION("libnativehelper.so", AFileDescriptor_create);
INIT_INTERCEPTABLE_STUB_FUNCTION("libnativehelper.so", AFileDescriptor_getFD);
+ INIT_INTERCEPTABLE_STUB_FUNCTION("libnativehelper.so", AFileDescriptor_getFd);
INIT_INTERCEPTABLE_STUB_FUNCTION("libnativehelper.so", AFileDescriptor_setFD);
+ INIT_INTERCEPTABLE_STUB_FUNCTION("libnativehelper.so", AFileDescriptor_setFd);
INIT_INTERCEPTABLE_STUB_FUNCTION("libnativehelper.so", DlCloseLibrary);
INIT_INTERCEPTABLE_STUB_FUNCTION("libnativehelper.so", DlGetError);
INIT_INTERCEPTABLE_STUB_FUNCTION("libnativehelper.so", DlGetSymbol);