commit 17a30e17b964e8714f5cda08f65edd63af56823b
author Evgeny Eltsin <eaeltsin@google.com> Mon Sep 28 14:20:24 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Sep 28 14:20:24 2020 +0000
tree d8a38fa814cfbdc7e3605722ec39f20932f44694
parent c938d09f2ee5035d4c176991b2099f8f073a0138
parent ffa53dbc4a2b36b01dd3ec7e058f070fe696bc10

[sc] Remove createStringArray & jniGetReferent. am: 6dc076610e am: cfc404d884 am: ffff81a063 am: ffa53dbc4a

Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/native_bridge_support/+/1440771

Change-Id: Ifc73dba3bb84bf4720432725dd848a42a7147f95

libnativehelper/stubs_arm.cc

diff --git a/libnativehelper/stubs_arm.cc b/libnativehelper/stubs_arm.cc
index 1281589..4a9c073 100644
--- a/libnativehelper/stubs_arm.cc
+++ b/libnativehelper/stubs_arm.cc
@@ -52,13 +52,11 @@
 DEFINE_INTERCEPTABLE_STUB_FUNCTION(JniInvocationInit);
 DEFINE_INTERCEPTABLE_STUB_FUNCTION(jniCreateFileDescriptor);
 DEFINE_INTERCEPTABLE_STUB_FUNCTION(jniCreateString);
-DEFINE_INTERCEPTABLE_STUB_FUNCTION(jniCreateStringArray);
 DEFINE_INTERCEPTABLE_STUB_FUNCTION(jniGetFDFromFileDescriptor);
 DEFINE_INTERCEPTABLE_STUB_FUNCTION(jniGetNioBufferBaseArray);
 DEFINE_INTERCEPTABLE_STUB_FUNCTION(jniGetNioBufferBaseArrayOffset);
 DEFINE_INTERCEPTABLE_STUB_FUNCTION(jniGetNioBufferFields);
 DEFINE_INTERCEPTABLE_STUB_FUNCTION(jniGetNioBufferPointer);
-DEFINE_INTERCEPTABLE_STUB_FUNCTION(jniGetReferent);
 DEFINE_INTERCEPTABLE_STUB_FUNCTION(jniLogException);
 DEFINE_INTERCEPTABLE_STUB_FUNCTION(jniRegisterNativeMethods);
 DEFINE_INTERCEPTABLE_STUB_FUNCTION(jniSetFileDescriptorOfFD);
@@ -105,13 +103,11 @@
   INIT_INTERCEPTABLE_STUB_FUNCTION("libnativehelper.so", JniInvocationInit);
   INIT_INTERCEPTABLE_STUB_FUNCTION("libnativehelper.so", jniCreateFileDescriptor);
   INIT_INTERCEPTABLE_STUB_FUNCTION("libnativehelper.so", jniCreateString);
-  INIT_INTERCEPTABLE_STUB_FUNCTION("libnativehelper.so", jniCreateStringArray);
   INIT_INTERCEPTABLE_STUB_FUNCTION("libnativehelper.so", jniGetFDFromFileDescriptor);
   INIT_INTERCEPTABLE_STUB_FUNCTION("libnativehelper.so", jniGetNioBufferBaseArray);
   INIT_INTERCEPTABLE_STUB_FUNCTION("libnativehelper.so", jniGetNioBufferBaseArrayOffset);
   INIT_INTERCEPTABLE_STUB_FUNCTION("libnativehelper.so", jniGetNioBufferFields);
   INIT_INTERCEPTABLE_STUB_FUNCTION("libnativehelper.so", jniGetNioBufferPointer);
-  INIT_INTERCEPTABLE_STUB_FUNCTION("libnativehelper.so", jniGetReferent);
   INIT_INTERCEPTABLE_STUB_FUNCTION("libnativehelper.so", jniLogException);
   INIT_INTERCEPTABLE_STUB_FUNCTION("libnativehelper.so", jniRegisterNativeMethods);
   INIT_INTERCEPTABLE_STUB_FUNCTION("libnativehelper.so", jniSetFileDescriptorOfFD);

libnativehelper/stubs_arm64.cc

diff --git a/libnativehelper/stubs_arm64.cc b/libnativehelper/stubs_arm64.cc
index 1281589..4a9c073 100644
--- a/libnativehelper/stubs_arm64.cc
+++ b/libnativehelper/stubs_arm64.cc
@@ -52,13 +52,11 @@
 DEFINE_INTERCEPTABLE_STUB_FUNCTION(JniInvocationInit);
 DEFINE_INTERCEPTABLE_STUB_FUNCTION(jniCreateFileDescriptor);
 DEFINE_INTERCEPTABLE_STUB_FUNCTION(jniCreateString);
-DEFINE_INTERCEPTABLE_STUB_FUNCTION(jniCreateStringArray);
 DEFINE_INTERCEPTABLE_STUB_FUNCTION(jniGetFDFromFileDescriptor);
 DEFINE_INTERCEPTABLE_STUB_FUNCTION(jniGetNioBufferBaseArray);
 DEFINE_INTERCEPTABLE_STUB_FUNCTION(jniGetNioBufferBaseArrayOffset);
 DEFINE_INTERCEPTABLE_STUB_FUNCTION(jniGetNioBufferFields);
 DEFINE_INTERCEPTABLE_STUB_FUNCTION(jniGetNioBufferPointer);
-DEFINE_INTERCEPTABLE_STUB_FUNCTION(jniGetReferent);
 DEFINE_INTERCEPTABLE_STUB_FUNCTION(jniLogException);
 DEFINE_INTERCEPTABLE_STUB_FUNCTION(jniRegisterNativeMethods);
 DEFINE_INTERCEPTABLE_STUB_FUNCTION(jniSetFileDescriptorOfFD);
@@ -105,13 +103,11 @@
   INIT_INTERCEPTABLE_STUB_FUNCTION("libnativehelper.so", JniInvocationInit);
   INIT_INTERCEPTABLE_STUB_FUNCTION("libnativehelper.so", jniCreateFileDescriptor);
   INIT_INTERCEPTABLE_STUB_FUNCTION("libnativehelper.so", jniCreateString);
-  INIT_INTERCEPTABLE_STUB_FUNCTION("libnativehelper.so", jniCreateStringArray);
   INIT_INTERCEPTABLE_STUB_FUNCTION("libnativehelper.so", jniGetFDFromFileDescriptor);
   INIT_INTERCEPTABLE_STUB_FUNCTION("libnativehelper.so", jniGetNioBufferBaseArray);
   INIT_INTERCEPTABLE_STUB_FUNCTION("libnativehelper.so", jniGetNioBufferBaseArrayOffset);
   INIT_INTERCEPTABLE_STUB_FUNCTION("libnativehelper.so", jniGetNioBufferFields);
   INIT_INTERCEPTABLE_STUB_FUNCTION("libnativehelper.so", jniGetNioBufferPointer);
-  INIT_INTERCEPTABLE_STUB_FUNCTION("libnativehelper.so", jniGetReferent);
   INIT_INTERCEPTABLE_STUB_FUNCTION("libnativehelper.so", jniLogException);
   INIT_INTERCEPTABLE_STUB_FUNCTION("libnativehelper.so", jniRegisterNativeMethods);
   INIT_INTERCEPTABLE_STUB_FUNCTION("libnativehelper.so", jniSetFileDescriptorOfFD);