Merge changes from topic "libgraphicsenv"
* changes:
Mark libui as vendor_available
GraphicsEnv is separated from libui
diff --git a/libs/arect/Android.bp b/libs/arect/Android.bp
index 0d25176..a20154f 100644
--- a/libs/arect/Android.bp
+++ b/libs/arect/Android.bp
@@ -23,5 +23,6 @@
cc_library_static {
name: "libarect",
host_supported: true,
+ vendor_available: true,
export_include_dirs: ["include"],
}
diff --git a/libs/math/Android.bp b/libs/math/Android.bp
index 3ef8b4a..693bace 100644
--- a/libs/math/Android.bp
+++ b/libs/math/Android.bp
@@ -15,6 +15,7 @@
cc_library_static {
name: "libmath",
host_supported: true,
+ vendor_available: true,
export_include_dirs: ["include"],
}
diff --git a/libs/nativewindow/Android.bp b/libs/nativewindow/Android.bp
index d759acb..938d426 100644
--- a/libs/nativewindow/Android.bp
+++ b/libs/nativewindow/Android.bp
@@ -63,4 +63,11 @@
],
}
+llndk_library {
+ name: "libnativewindow",
+ symbol_file: "libnativewindow.map.vndk.txt",
+ unversioned: true,
+ export_include_dirs: ["include"],
+}
+
subdirs = ["tests"]
diff --git a/libs/nativewindow/libnativewindow.map.vndk.txt b/libs/nativewindow/libnativewindow.map.vndk.txt
new file mode 100644
index 0000000..eed4e19
--- /dev/null
+++ b/libs/nativewindow/libnativewindow.map.vndk.txt
@@ -0,0 +1,44 @@
+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:
+ *;
+};