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

Commit 8ebc072d authored by Jiyong Park's avatar Jiyong Park
Browse files

add # vndk tags to vndk-only symbols of libnativewindow 

... instead of having separate map file for vndk.

Bug: 37488074
Test: BOARD_VNDK_VERSION=current m libnativewindow successful
Change-Id: I3064f0830156cde5df7b05dfb11e45735e17add3
parent 0453ee35

libs/nativewindow/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ cc_library { 


llndk_library {

    name: "libnativewindow",

    symbol_file: "libnativewindow.map.vndk.txt",

    symbol_file: "libnativewindow.map.txt",

    unversioned: true,

    export_include_dirs: ["include"],

}

libs/nativewindow/libnativewindow.map.txt

+18 −0
Original line number Diff line number Diff line
@@ -4,22 +4,40 @@ LIBNATIVEWINDOW { 
    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

    ANativeWindow_OemStorageSet; # vndk

    ANativeWindow_acquire;

    ANativeWindow_cancelBuffer; # vndk

    ANativeWindow_dequeueBuffer; # vndk

    ANativeWindow_fromSurface;

    ANativeWindow_fromSurfaceTexture;

    ANativeWindow_getFormat;

    ANativeWindow_getHeight;

    ANativeWindow_getWidth;

    ANativeWindow_lock;

    ANativeWindow_query; # vndk

    ANativeWindow_queryf; # vndk

    ANativeWindow_queueBuffer; # vndk

    ANativeWindow_release;

    ANativeWindow_setAutoRefresh; # vndk

    ANativeWindow_setBufferCount; # vndk

    ANativeWindow_setBufferDataSpace; # vndk

    ANativeWindow_setBuffersDimensions; # vndk

    ANativeWindow_setBuffersFormat; # vndk

    ANativeWindow_setBuffersGeometry;

    ANativeWindow_setBuffersTimestamp; # vndk

    ANativeWindow_setBuffersTransform;

    ANativeWindow_setSharedBufferMode; # vndk

    ANativeWindow_setSwapInterval; # vndk

    ANativeWindow_setUsage; # vndk

    ANativeWindow_unlockAndPost;

  local:

    *;

libs/nativewindow/libnativewindow.map.vndk.txt

deleted100644 → 0
+0 −44
Original line number Diff line number Diff line 
LIBNATIVEWINDOW {

  global:

    AHardwareBuffer_acquire;

    AHardwareBuffer_allocate;

    AHardwareBuffer_describe;

    AHardwareBuffer_fromHardwareBuffer;

    AHardwareBuffer_getNativeHandle;

    AHardwareBuffer_lock;

    AHardwareBuffer_recvHandleFromUnixSocket;

    AHardwareBuffer_release;

    AHardwareBuffer_sendHandleToUnixSocket;

    AHardwareBuffer_toHardwareBuffer;

    AHardwareBuffer_unlock;

    ANativeWindowBuffer_getHardwareBuffer;

    ANativeWindow_OemStorageGet;

    ANativeWindow_OemStorageSet;

    ANativeWindow_acquire;

    ANativeWindow_cancelBuffer;

    ANativeWindow_dequeueBuffer;

    ANativeWindow_fromSurface;

    ANativeWindow_fromSurfaceTexture;

    ANativeWindow_getFormat;

    ANativeWindow_getHeight;

    ANativeWindow_getWidth;

    ANativeWindow_lock;

    ANativeWindow_query;

    ANativeWindow_queryf;

    ANativeWindow_queueBuffer;

    ANativeWindow_release;

    ANativeWindow_setAutoRefresh;

    ANativeWindow_setBufferCount;

    ANativeWindow_setBufferDataSpace;

    ANativeWindow_setBuffersDimensions;

    ANativeWindow_setBuffersFormat;

    ANativeWindow_setBuffersGeometry;

    ANativeWindow_setBuffersTimestamp;

    ANativeWindow_setBuffersTransform;

    ANativeWindow_setSharedBufferMode;

    ANativeWindow_setSwapInterval;

    ANativeWindow_setUsage;

    ANativeWindow_unlockAndPost;

  local:

    *;

};