Snap for 7384269 from f65a2d53a62467462f5d20935cf5ab7ae5b335b8 to sc-d1-release

Change-Id: I167af2bd95b49c5096e14b17cf4aa3231acde7c2

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;
+};