commit 879cf3efd9744160664bd3508c127d49a5c09ec0
author Android Build Role Account android-build-prod <android-build-team-robot@google.com> Sat May 15 10:05:20 2021 +0000
committer Android Build Role Account android-build-prod <android-build-team-robot@google.com> Sat May 15 10:05:20 2021 +0000
tree 25b6dafdcf2bb6efe4a3747a2aa313de9d887249
parent c107e055cd3195a183e36deeda94ab4400f5f768
parent a4152cc1b81e8264e9066b3f06e39ec0f5585ce6

Snap for 7364285 from a4152cc1b81e8264e9066b3f06e39ec0f5585ce6 to s-keystone-qcom-release

Change-Id: I485bbe9c29986347b54559aea61f51bd6eb1ba84

libnativehelper/stubs_arm.cc

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

libnativehelper/stubs_arm64.cc

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