commit b8cfad5753a50a6b1329f5f361c047e85e583e40
author Steven Moreland <smoreland@google.com> Wed Jan 09 13:07:00 2019 -0800
committer Steven Moreland <smoreland@google.com> Thu Jan 10 12:54:41 2019 -0800
tree 996140e9145bd53037edfad3a5c968b034faf6f1
parent a7fa269ddaf4ee156bbe4796f0e77541d1283f98

Add # apex symbols.

Bug: 120637510
Test: manually verify APEX symbols aren't in the NDK stub
m libbinder_ndk libbinder_ndk.ndk.Q libbinder_ndk.ndk.current
readelf -Ws $ANDROID_PRODUCT_OUT/obj/SHARED_LIBRARIES/libbinder_ndk.ndk.Q_intermediates/libbinder_ndk.so | grep AServiceManager
< command failed >
readelf -Ws $ANDROID_PRODUCT_OUT/obj/SHARED_LIBRARIES/libbinder_ndk.ndk.current_intermediates/libbinder_ndk.so | grep AServiceManager
< command failed >
readelf -Ws $ANDROID_PRODUCT_OUT/obj/SHARED_LIBRARIES/libbinder_ndk_intermediates/libbinder_ndk.so | grep AServiceManager_getService
   261: 000000000000ede8   244 FUNC    GLOBAL DEFAULT   14 AServiceManager_getService

Change-Id: I9377c72c30fbad5993d580506ed5a061f78e81b6

libs/binder/ndk/Android.bp

diff --git a/libs/binder/ndk/Android.bp b/libs/binder/ndk/Android.bp
index 1b69dfd..05655c1 100644
--- a/libs/binder/ndk/Android.bp
+++ b/libs/binder/ndk/Android.bp
@@ -23,7 +23,11 @@
         "include_apex",
     ],
 
-    cflags: ["-Wall", "-Wextra", "-Werror"],
+    cflags: [
+        "-Wall",
+        "-Wextra",
+        "-Werror",
+    ],
 
     srcs: [
         "ibinder.cpp",

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 ee7132f..f0d25f7 100644
--- a/libs/binder/ndk/libbinder_ndk.map.txt
+++ b/libs/binder/ndk/libbinder_ndk.map.txt
@@ -87,6 +87,11 @@
     AStatus_getStatus;
     AStatus_isOk;
     AStatus_newOk;
+    ABinderProcess_joinThreadPool; # apex
+    ABinderProcess_setThreadPoolMaxThreadCount; # apex
+    ABinderProcess_startThreadPool; # apex
+    AServiceManager_addService; # apex
+    AServiceManager_getService; # apex
   local:
     *;
 };

libs/binder/ndk/scripts/init_map.sh

diff --git a/libs/binder/ndk/scripts/init_map.sh b/libs/binder/ndk/scripts/init_map.sh
index 1f74e43..3529b72 100755
--- a/libs/binder/ndk/scripts/init_map.sh
+++ b/libs/binder/ndk/scripts/init_map.sh
@@ -10,6 +10,10 @@
     grep -oP "AParcel_[a-zA-Z0-9_]+(?=\()" include_ndk/android/binder_parcel.h;
     grep -oP "AStatus_[a-zA-Z0-9_]+(?=\()" include_ndk/android/binder_status.h;
 } | sort | uniq | awk '{ print "    " $0 ";"; }'
+{
+    grep -oP "AServiceManager_[a-zA-Z0-9_]+(?=\()" include_apex/android/binder_manager.h;
+    grep -oP "ABinderProcess_[a-zA-Z0-9_]+(?=\()" include_apex/android/binder_process.h;
+} | sort | uniq | awk '{ print "    " $0 "; # apex"; }'
 echo "  local:"
 echo "    *;"
 echo "};"