diff options
| author | Orion Hodson <oth@google.com> | 2021-05-24 16:29:50 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-05-24 16:29:50 +0000 |
| commit | 567a9935b0f762588fdf7fe34decf17e7325afaf (patch) | |
| tree | 08bb474c77a5ea1d55513549df6dd119e8ea078a | |
| parent | 98e3800bca8ff4711550e258678fd9785a7986c4 (diff) | |
| parent | 328a2fdb377e6543253e1f9bc235292bcaf60e62 (diff) | |
| download | native_bridge_support-android-s-beta-4.tar.gz | |
Update stubs for libnativehelper am: 328a2fdb37android-s-beta-4android-s-beta-3android-s-beta-4
Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/native_bridge_support/+/1715892
Change-Id: Iaafb2498f864ee4bdabed4fd49e7fdf13825cd99
| -rw-r--r-- | libnativehelper/stubs_arm.cc | 8 | ||||
| -rw-r--r-- | libnativehelper/stubs_arm64.cc | 8 |
2 files changed, 4 insertions, 12 deletions
diff --git a/libnativehelper/stubs_arm.cc b/libnativehelper/stubs_arm.cc index b6cd163..e0d9d15 100644 --- a/libnativehelper/stubs_arm.cc +++ b/libnativehelper/stubs_arm.cc @@ -50,16 +50,14 @@ DEFINE_INTERCEPTABLE_STUB_FUNCTION(JniInvocationDestroy); DEFINE_INTERCEPTABLE_STUB_FUNCTION(JniInvocationGetLibrary); DEFINE_INTERCEPTABLE_STUB_FUNCTION(JniInvocationGetLibraryWith); DEFINE_INTERCEPTABLE_STUB_FUNCTION(JniInvocationInit); -DEFINE_INTERCEPTABLE_STUB_FUNCTION(jniCreateFileDescriptor); DEFINE_INTERCEPTABLE_STUB_FUNCTION(jniCreateString); -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(jniLogException); DEFINE_INTERCEPTABLE_STUB_FUNCTION(jniRegisterNativeMethods); -DEFINE_INTERCEPTABLE_STUB_FUNCTION(jniSetFileDescriptorOfFD); +DEFINE_INTERCEPTABLE_STUB_FUNCTION(jniThrowErrnoException); DEFINE_INTERCEPTABLE_STUB_FUNCTION(jniThrowException); DEFINE_INTERCEPTABLE_STUB_FUNCTION(jniThrowExceptionFmt); DEFINE_INTERCEPTABLE_STUB_FUNCTION(jniThrowIOException); @@ -101,16 +99,14 @@ static void __attribute__((constructor(0))) init_stub_library() { INIT_INTERCEPTABLE_STUB_FUNCTION("libnativehelper.so", JniInvocationGetLibrary); INIT_INTERCEPTABLE_STUB_FUNCTION("libnativehelper.so", JniInvocationGetLibraryWith); 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", 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", jniLogException); INIT_INTERCEPTABLE_STUB_FUNCTION("libnativehelper.so", jniRegisterNativeMethods); - INIT_INTERCEPTABLE_STUB_FUNCTION("libnativehelper.so", jniSetFileDescriptorOfFD); + INIT_INTERCEPTABLE_STUB_FUNCTION("libnativehelper.so", jniThrowErrnoException); INIT_INTERCEPTABLE_STUB_FUNCTION("libnativehelper.so", jniThrowException); INIT_INTERCEPTABLE_STUB_FUNCTION("libnativehelper.so", jniThrowExceptionFmt); INIT_INTERCEPTABLE_STUB_FUNCTION("libnativehelper.so", jniThrowIOException); diff --git a/libnativehelper/stubs_arm64.cc b/libnativehelper/stubs_arm64.cc index b6cd163..e0d9d15 100644 --- a/libnativehelper/stubs_arm64.cc +++ b/libnativehelper/stubs_arm64.cc @@ -50,16 +50,14 @@ DEFINE_INTERCEPTABLE_STUB_FUNCTION(JniInvocationDestroy); DEFINE_INTERCEPTABLE_STUB_FUNCTION(JniInvocationGetLibrary); DEFINE_INTERCEPTABLE_STUB_FUNCTION(JniInvocationGetLibraryWith); DEFINE_INTERCEPTABLE_STUB_FUNCTION(JniInvocationInit); -DEFINE_INTERCEPTABLE_STUB_FUNCTION(jniCreateFileDescriptor); DEFINE_INTERCEPTABLE_STUB_FUNCTION(jniCreateString); -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(jniLogException); DEFINE_INTERCEPTABLE_STUB_FUNCTION(jniRegisterNativeMethods); -DEFINE_INTERCEPTABLE_STUB_FUNCTION(jniSetFileDescriptorOfFD); +DEFINE_INTERCEPTABLE_STUB_FUNCTION(jniThrowErrnoException); DEFINE_INTERCEPTABLE_STUB_FUNCTION(jniThrowException); DEFINE_INTERCEPTABLE_STUB_FUNCTION(jniThrowExceptionFmt); DEFINE_INTERCEPTABLE_STUB_FUNCTION(jniThrowIOException); @@ -101,16 +99,14 @@ static void __attribute__((constructor(0))) init_stub_library() { INIT_INTERCEPTABLE_STUB_FUNCTION("libnativehelper.so", JniInvocationGetLibrary); INIT_INTERCEPTABLE_STUB_FUNCTION("libnativehelper.so", JniInvocationGetLibraryWith); 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", 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", jniLogException); INIT_INTERCEPTABLE_STUB_FUNCTION("libnativehelper.so", jniRegisterNativeMethods); - INIT_INTERCEPTABLE_STUB_FUNCTION("libnativehelper.so", jniSetFileDescriptorOfFD); + INIT_INTERCEPTABLE_STUB_FUNCTION("libnativehelper.so", jniThrowErrnoException); INIT_INTERCEPTABLE_STUB_FUNCTION("libnativehelper.so", jniThrowException); INIT_INTERCEPTABLE_STUB_FUNCTION("libnativehelper.so", jniThrowExceptionFmt); INIT_INTERCEPTABLE_STUB_FUNCTION("libnativehelper.so", jniThrowIOException); |