Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b8cfad57 authored by Steven Moreland's avatar Steven Moreland
Browse files

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
parent a7fa269d

libs/binder/ndk/Android.bp

+5 −1
Original line number Diff line number Diff line
@@ -23,7 +23,11 @@ cc_library { 
        "include_apex",

    ],



    cflags: ["-Wall", "-Wextra", "-Werror"],

    cflags: [

        "-Wall",

        "-Wextra",

        "-Werror",

    ],



    srcs: [

        "ibinder.cpp",

libs/binder/ndk/libbinder_ndk.map.txt

+5 −0
Original line number Diff line number Diff line
@@ -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:

    *;

};

libs/binder/ndk/scripts/init_map.sh

+4 −0
Original line number Diff line number Diff line
@@ -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 "};"