summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOrion Hodson <oth@google.com>2021-05-13 14:08:02 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-05-13 14:08:02 +0000
commit81ea680239fa7a5e2c22e428dd16feaff5d54551 (patch)
tree226ba5cf24145730d88505a2f677a1aba80f9f65
parent68a6e8e60305289fc7477cf8d2e5cf00048632e6 (diff)
parent7d753f819b1de0e4ba3d7d059b08a28f65101b6e (diff)
downloadnative_bridge_support-81ea680239fa7a5e2c22e428dd16feaff5d54551.tar.gz
Remove libnativehelper methods AFileDescriptor_{get,set}FD am: 7d753f819b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/libs/native_bridge_support/+/14516676 Change-Id: Ib47fada798be8a62460da76ae93c5a4891fc5d53
-rw-r--r--libnativehelper/stubs_arm.cc4
-rw-r--r--libnativehelper/stubs_arm64.cc4
2 files changed, 0 insertions, 8 deletions
diff --git a/libnativehelper/stubs_arm.cc b/libnativehelper/stubs_arm.cc
index 1281ff3..b6cd163 100644
--- a/libnativehelper/stubs_arm.cc
+++ b/libnativehelper/stubs_arm.cc
@@ -18,9 +18,7 @@
#include "native_bridge_support/vdso/interceptable_functions.h"
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);
@@ -71,9 +69,7 @@ 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);
diff --git a/libnativehelper/stubs_arm64.cc b/libnativehelper/stubs_arm64.cc
index 1281ff3..b6cd163 100644
--- a/libnativehelper/stubs_arm64.cc
+++ b/libnativehelper/stubs_arm64.cc
@@ -18,9 +18,7 @@
#include "native_bridge_support/vdso/interceptable_functions.h"
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);
@@ -71,9 +69,7 @@ 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);