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

Commit b9fdddb3 authored by dimitry's avatar dimitry
Browse files

Actually apply version script 

Remove absent symbols - they were never exported. Explicitly add
private/ symbols to LIBNATIVEWINDOW_PLATFORM version.

Bug: http://b/69603741
Test: make && boot taimen
Change-Id: I6ff7c170a5ad5f0bcee5d65e27aef04310286a21
parent 8a213534

libs/nativewindow/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -44,6 +44,8 @@ cc_library { 
        "-std=c++1z"

    ],



    version_script: "libnativewindow.map.txt",



    srcs: [

        "AHardwareBuffer.cpp",

        "ANativeWindow.cpp",

libs/nativewindow/libnativewindow.map.txt

+14 −4
Original line number Diff line number Diff line
@@ -3,13 +3,11 @@ LIBNATIVEWINDOW { 
    AHardwareBuffer_acquire;

    AHardwareBuffer_allocate;

    AHardwareBuffer_describe;

    AHardwareBuffer_fromHardwareBuffer;

    AHardwareBuffer_getNativeHandle; # vndk

    AHardwareBuffer_lock;

    AHardwareBuffer_recvHandleFromUnixSocket;

    AHardwareBuffer_release;

    AHardwareBuffer_sendHandleToUnixSocket;

    AHardwareBuffer_toHardwareBuffer;

    AHardwareBuffer_unlock;

    ANativeWindowBuffer_getHardwareBuffer; # vndk

    ANativeWindow_OemStorageGet; # vndk
@@ -17,8 +15,6 @@ LIBNATIVEWINDOW { 
    ANativeWindow_acquire;

    ANativeWindow_cancelBuffer; # vndk

    ANativeWindow_dequeueBuffer; # vndk

    ANativeWindow_fromSurface;

    ANativeWindow_fromSurfaceTexture;

    ANativeWindow_getFormat;

    ANativeWindow_getHeight;

    ANativeWindow_getWidth;
@@ -42,3 +38,17 @@ LIBNATIVEWINDOW { 
  local:

    *;

};



LIBNATIVEWINDOW_PLATFORM {

  global:

    extern "C++" {

      android::AHardwareBuffer_isValidPixelFormat*;

      android::AHardwareBuffer_convertFromPixelFormat*;

      android::AHardwareBuffer_convertToPixelFormat*;

      android::AHardwareBuffer_convertFromGrallocUsageBits*;

      android::AHardwareBuffer_convertToGrallocUsageBits*;

      android::AHardwareBuffer_to_GraphicBuffer*;

      android::AHardwareBuffer_to_ANativeWindowBuffer*;

      android::AHardwareBuffer_from_GraphicBuffer*;

    };

} LIBNATIVEWINDOW;