commit 72b9ba2e4eb624fea9111f6d5405747b4a4c22ce
author Orion Hodson <oth@google.com> Wed May 12 12:49:29 2021 +0100
committer Orion Hodson <oth@google.com> Wed May 12 19:35:25 2021 +0100
tree 226ba5cf24145730d88505a2f677a1aba80f9f65
parent 362ce802bc270fc86cfbb113f23f175abeeea747

Remove libnativehelper methods AFileDescriptor_{get,set}FD

These are replaced by AFileDescriptor_{get,set}Fd.

Bug: 185256332
Test: TH

(cherry picked from commit 7d753f819b1de0e4ba3d7d059b08a28f65101b6e)
Merged-In: Ib327fcfbc442e5c0e9d3aea8ef60fc670ac38b26
Change-Id: I60c7dbc2c24b073b7139b0948aedb28cf2a6d551

libnativehelper/stubs_arm.cc

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 @@
 
 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);

libnativehelper/stubs_arm64.cc

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 @@
 
 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);