Import libdrm 2.4.123

4 files changed, 22 insertions, 3 deletions

diff --git a/lib/libdrm/omap/Android.bp b/lib/libdrm/omap/Android.bp
new file mode 100644
index 000000000..05ca7d2db
--- /dev/null
+++ b/lib/libdrm/omap/Android.bp
@@ -0,0 +1,12 @@
+build = ["Android.sources.bp"]
+
+cc_library_shared {
+    name: "libdrm_omap",
+    defaults: [
+        "libdrm_defaults",
+        "libdrm_omap_sources",
+    ],
+    vendor: true,
+
+    shared_libs: ["libdrm"],
+}
diff --git a/lib/libdrm/omap/Android.sources.bp b/lib/libdrm/omap/Android.sources.bp
new file mode 100644
index 000000000..3c7da94a4
--- /dev/null
+++ b/lib/libdrm/omap/Android.sources.bp
@@ -0,0 +1,8 @@
+// Autogenerated with Android.sources.bp.mk
+
+cc_defaults {
+    name: "libdrm_omap_sources",
+    srcs: [
+	"omap_drm.c",
+    ],
+}
diff --git a/lib/libdrm/omap/meson.build b/lib/libdrm/omap/meson.build
index eebd1420f..8187825a6 100644
--- a/lib/libdrm/omap/meson.build
+++ b/lib/libdrm/omap/meson.build
@@ -26,7 +26,7 @@ libdrm_omap = library(
   gnu_symbol_visibility : 'hidden',
   link_with : libdrm,
   dependencies : [dep_threads, dep_atomic_ops],
-  version : '1.0.0',
+  version : '1.@0@.0'.format(patch_ver),
   install : true,
 )
 
@@ -56,6 +56,6 @@ test(
   args : [
     '--lib', libdrm_omap,
     '--symbols-file', files('omap-symbols.txt'),
-    '--nm', prog_nm.path(),
+    '--nm', prog_nm.full_path(),
   ],
 )
diff --git a/lib/libdrm/omap/omap_drm.c b/lib/libdrm/omap/omap_drm.c
index aa2736604..42d35ef77 100644
--- a/lib/libdrm/omap/omap_drm.c
+++ b/lib/libdrm/omap/omap_drm.c
@@ -27,7 +27,6 @@
  */
 
 #include <stdlib.h>
-#include <linux/stddef.h>
 #include <linux/types.h>
 #include <errno.h>
 #include <sys/mman.h>