From b3c71732122580d43034d41bd1058fc434ef25ba Mon Sep 17 00:00:00 2001
From: Jonathan Gray <jsg@cvs.openbsd.org>
Date: Fri, 21 Aug 2015 23:56:27 +0000
Subject: Import libdrm 2.4.64

---
 lib/libdrm/Android.mk                | 19 -------------------
 lib/libdrm/tests/modetest/Android.mk |  1 -
 2 files changed, 20 deletions(-)

diff --git a/lib/libdrm/Android.mk b/lib/libdrm/Android.mk
index 1d8cd6517..90cdcb323 100644
--- a/lib/libdrm/Android.mk
+++ b/lib/libdrm/Android.mk
@@ -27,8 +27,6 @@ include $(CLEAR_VARS)
 # Import variables LIBDRM_{,H_,INCLUDE_H_,INCLUDE_VMWGFX_H_}FILES
 include $(LOCAL_PATH)/Makefile.sources
 
-#static library for the device (recovery)
-include $(CLEAR_VARS)
 LOCAL_MODULE := libdrm
 LOCAL_MODULE_TAGS := optional
 
@@ -43,24 +41,7 @@ LOCAL_C_INCLUDES := \
 LOCAL_CFLAGS := \
 	-DHAVE_VISIBILITY=1 \
 	-DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1
-include $(BUILD_STATIC_LIBRARY)
-
-# Shared library for the device
-include $(CLEAR_VARS)
-LOCAL_MODULE := libdrm
-LOCAL_MODULE_TAGS := optional
 
-LOCAL_SRC_FILES := $(LIBDRM_FILES)
-LOCAL_EXPORT_C_INCLUDE_DIRS := \
-        $(LOCAL_PATH) \
-        $(LOCAL_PATH)/include/drm
-
-LOCAL_C_INCLUDES := \
-        $(LOCAL_PATH)/include/drm
-
-LOCAL_CFLAGS := \
-        -DHAVE_VISIBILITY=1 \
-        -DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1
 include $(BUILD_SHARED_LIBRARY)
 
 include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/lib/libdrm/tests/modetest/Android.mk b/lib/libdrm/tests/modetest/Android.mk
index e616558fd..0fdfe6856 100644
--- a/lib/libdrm/tests/modetest/Android.mk
+++ b/lib/libdrm/tests/modetest/Android.mk
@@ -8,6 +8,5 @@ LOCAL_SRC_FILES := $(MODETEST_FILES)
 LOCAL_MODULE := modetest
 
 LOCAL_SHARED_LIBRARIES := libdrm
-LOCAL_STATIC_LIBRARIES := libdrm_util
 
 include $(BUILD_EXECUTABLE)
-- 
cgit v1.2.3