From b8cfad5753a50a6b1329f5f361c047e85e583e40 Mon Sep 17 00:00:00 2001
From: Steven Moreland <smoreland@google.com>
Date: Wed, 9 Jan 2019 13:07:00 -0800
Subject: 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            | 6 +++++-
 libs/binder/ndk/libbinder_ndk.map.txt | 5 +++++
 libs/binder/ndk/scripts/init_map.sh   | 4 ++++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/libs/binder/ndk/Android.bp b/libs/binder/ndk/Android.bp
index 1b69dfd6a7..05655c18c5 100644
--- a/libs/binder/ndk/Android.bp
+++ b/libs/binder/ndk/Android.bp
@@ -23,7 +23,11 @@ cc_library {
         "include_apex",
     ],
 
-    cflags: ["-Wall", "-Wextra", "-Werror"],
+    cflags: [
+        "-Wall",
+        "-Wextra",
+        "-Werror",
+    ],
 
     srcs: [
         "ibinder.cpp",
diff --git a/libs/binder/ndk/libbinder_ndk.map.txt b/libs/binder/ndk/libbinder_ndk.map.txt
index ee7132f87f..f0d25f79e3 100644
--- a/libs/binder/ndk/libbinder_ndk.map.txt
+++ b/libs/binder/ndk/libbinder_ndk.map.txt
@@ -87,6 +87,11 @@ LIBBINDER_NDK { # introduced=29
     AStatus_getStatus;
     AStatus_isOk;
     AStatus_newOk;
+    ABinderProcess_joinThreadPool; # apex
+    ABinderProcess_setThreadPoolMaxThreadCount; # apex
+    ABinderProcess_startThreadPool; # apex
+    AServiceManager_addService; # apex
+    AServiceManager_getService; # apex
   local:
     *;
 };
diff --git a/libs/binder/ndk/scripts/init_map.sh b/libs/binder/ndk/scripts/init_map.sh
index 1f74e438cf..3529b725ce 100755
--- a/libs/binder/ndk/scripts/init_map.sh
+++ b/libs/binder/ndk/scripts/init_map.sh
@@ -10,6 +10,10 @@ echo "  global:"
     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 "};"
-- 
cgit v1.2.3-59-g8ed1b