commit b2de953270c83edc2ef84a9771232c3911a9b9a9
author Steven Moreland <smoreland@google.com> Fri May 29 21:44:41 2020 +0000
committer Steven Moreland <smoreland@google.com> Wed Jul 15 18:18:13 2020 +0000
tree 7d7230a72decdb99e400b54de2391d207d24a499
parent 6c03e13d4b0c8df8cbdd06aa3fc5a94abdb3ddb5

Allow AIBinder<->IBinder when sharing libbinder.

Fixes: 159372351
Test: libbinder_ndk_unit_test
Change-Id: I4051e32e487e92ee70f85a733877cd709fc510eb

libs/binder/ndk/libbinder_ndk.map.txt

diff --git a/libs/binder/ndk/libbinder_ndk.map.txt b/libs/binder/ndk/libbinder_ndk.map.txt
index d58b75c..9b5fa26 100644
--- a/libs/binder/ndk/libbinder_ndk.map.txt
+++ b/libs/binder/ndk/libbinder_ndk.map.txt
@@ -95,8 +95,6 @@
     AServiceManager_addService; # apex llndk
     AServiceManager_checkService; # apex llndk
     AServiceManager_getService; # apex llndk
-  local:
-    *;
 };
 
 LIBBINDER_NDK30 { # introduced=30
@@ -111,19 +109,21 @@
     AIBinder_markVendorStability; # llndk
     AIBinder_markVintfStability; # apex llndk
     AIBinder_Class_setHandleShellCommand; # apex llndk
-  local:
-    *;
 };
 
 LIBBINDER_NDK31 { # introduced=31
   global:
     AIBinder_getCallingSid; # apex
     AIBinder_setRequestingSid; # apex
-  local:
-    *;
 };
 
 LIBBINDER_NDK_PLATFORM {
   global:
     AParcel_getAllowFds;
+    extern "C++" {
+        AIBinder_fromPlatformBinder*;
+        AIBinder_toPlatformBinder*;
+    };
+  local:
+    *;
 };