diff options
author | Orion Hodson <oth@google.com> | 2021-05-20 19:59:34 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-05-20 19:59:34 +0000 |
commit | 934bb0e62a524391e64d5db33780d7fb1504774a (patch) | |
tree | 1421dc7ca1f0a95c2e2f3889e09e4fa0c65b0ded | |
parent | d58636dbe4b7e51ccc3181c67686acc7642c541f (diff) | |
parent | f65a2d53a62467462f5d20935cf5ab7ae5b335b8 (diff) | |
download | extras-934bb0e62a524391e64d5db33780d7fb1504774a.tar.gz |
Update libnativehelper NDK API am: f65a2d53a6
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/extras/+/14662186
Change-Id: I9e2be211cdf983a1375f01adb5c81d90b472b860
-rw-r--r-- | module_ndk_libs/libnativehelper/include/android/file_descriptor_jni.h | 4 | ||||
-rw-r--r-- | module_ndk_libs/libnativehelper/libnativehelper.map.txt | 41 |
2 files changed, 21 insertions, 24 deletions
diff --git a/module_ndk_libs/libnativehelper/include/android/file_descriptor_jni.h b/module_ndk_libs/libnativehelper/include/android/file_descriptor_jni.h index fbdfef51..26529b99 100644 --- a/module_ndk_libs/libnativehelper/include/android/file_descriptor_jni.h +++ b/module_ndk_libs/libnativehelper/include/android/file_descriptor_jni.h @@ -29,6 +29,10 @@ #include <jni.h> +#if !defined(__BIONIC__) && !defined(__INTRODUCED_IN) +#define __INTRODUCED_IN(x) +#endif + __BEGIN_DECLS /** diff --git a/module_ndk_libs/libnativehelper/libnativehelper.map.txt b/module_ndk_libs/libnativehelper/libnativehelper.map.txt index 72efd923..9ef00813 100644 --- a/module_ndk_libs/libnativehelper/libnativehelper.map.txt +++ b/module_ndk_libs/libnativehelper/libnativehelper.map.txt @@ -10,30 +10,23 @@ LIBNATIVEHELPER_S { # introduced=S JNI_GetDefaultJavaVMInitArgs; JNI_GetCreatedJavaVMs; - # API for platform and modules only. - jniRegisterNativeMethods; # apex - jniThrowException; # apex - jniThrowExceptionFmt; # apex - jniThrowNullPointerException; # apex - jniThrowRuntimeException; # apex - jniThrowIOException; # apex - jniThrowErrnoException; # apex - jniCreateFileDescriptor; # apex - jniGetFDFromFileDescriptor; # apex - jniSetFileDescriptorOfFD; # apex - jniGetNioBufferBaseArray; # apex - jniGetNioBufferBaseArrayOffset; # apex - jniGetNioBufferPointer; # apex - jniGetNioBufferFields; # apex - jniCreateString; # apex - jniLogException; # apex - jniUninitializeConstants; # apex - - JniInvocationCreate; # apex - JniInvocationDestroy; # apex - JniInvocationInit; # apex - JniInvocationGetLibrary; # apex - local: *; }; + +LIBNATIVEHELPER_PLATFORM { # platform-only + global: + JniInvocationCreate; + JniInvocationDestroy; + JniInvocationInit; + JniInvocationGetLibrary; + + jniGetNioBufferBaseArray; + jniGetNioBufferBaseArrayOffset; + jniGetNioBufferPointer; + jniGetNioBufferFields; + + jniRegisterNativeMethods; + jniUninitializeConstants; + jniLogException; +}; |