1 files changed, 0 insertions, 133 deletions
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index 2a980ad0..00000000
--- a/Android.mk
+++ /dev/null
@@ -1,133 +0,0 @@
-#
-# Copyright © 2011-2012 Intel Corporation
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice (including the next
-# paragraph) shall be included in all copies or substantial portions of the
-# Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-# IN THE SOFTWARE.
-#
-# Two identical libs are defined here.
-# libdrm: for vendors. installed to /vendor/lib. libdrm_<vendor> uses this.
-# libdrm_platform: for platform modules (such as libminui). installed to /system/lib
-LIBDRM_COMMON_MK := $(call my-dir)/Android.common.mk
-LOCAL_PATH := $(call my-dir)
-# Import variables LIBDRM_{,H_,INCLUDE_H_,INCLUDE_VMWGFX_H_}FILES
-include $(LOCAL_PATH)/Makefile.sources
-common_CFLAGS := \
-        -Wall -Werror \
-        -Wno-enum-conversion \
-        -Wno-pointer-arith \
-        -Wno-sign-compare \
-        -Wno-tautological-compare
-# Static library for the device (recovery)
-include $(CLEAR_VARS)
-LOCAL_MODULE := libdrm_platform
-LOCAL_SRC_FILES := $(filter-out %.h,$(LIBDRM_FILES))
-LOCAL_EXPORT_C_INCLUDE_DIRS := \
-        $(LOCAL_PATH) \
-        $(LOCAL_PATH)/include/drm
-LOCAL_C_INCLUDES := \
-        $(LOCAL_PATH)/include/drm
-LOCAL_CFLAGS := \
-        $(common_CFLAGS)
-include $(LIBDRM_COMMON_MK)
-include $(BUILD_STATIC_LIBRARY)
-# Dynamic library for the device
-include $(CLEAR_VARS)
-LOCAL_MODULE := libdrm_platform
-LOCAL_SRC_FILES := $(filter-out %.h,$(LIBDRM_FILES))
-LOCAL_EXPORT_C_INCLUDE_DIRS := \
-        $(LOCAL_PATH) \
-        $(LOCAL_PATH)/include/drm
-LOCAL_C_INCLUDES := \
-        $(LOCAL_PATH)/include/drm
-LOCAL_CFLAGS := \
-        $(common_CFLAGS)
-include $(LIBDRM_COMMON_MK)
-include $(BUILD_SHARED_LIBRARY)
-ifneq ($(TARGET_USE_PRIVATE_LIBDRM),true)
-# Import variables LIBDRM_{,H_,INCLUDE_H_,INCLUDE_VMWGFX_H_}FILES
-include $(LOCAL_PATH)/Makefile.sources
-common_CFLAGS := \
-        -Wno-enum-conversion \
-        -Wno-pointer-arith \
-        -Wno-sign-compare \
-        -Wno-tautological-compare
-# Static library for the device (recovery)
-include $(CLEAR_VARS)
-LOCAL_MODULE := libdrm
-LOCAL_VENDOR_MODULE := true
-LOCAL_SRC_FILES := $(filter-out %.h,$(LIBDRM_FILES))
-LOCAL_EXPORT_C_INCLUDE_DIRS := \
-        $(LOCAL_PATH) \
-        $(LOCAL_PATH)/include/drm
-LOCAL_C_INCLUDES := \
-        $(LOCAL_PATH)/include/drm
-LOCAL_CFLAGS := \
-        $(common_CFLAGS)
-include $(LIBDRM_COMMON_MK)
-include $(BUILD_STATIC_LIBRARY)
-# Dynamic library for the device
-include $(CLEAR_VARS)
-LOCAL_MODULE := libdrm
-LOCAL_VENDOR_MODULE := true
-LOCAL_SRC_FILES := $(filter-out %.h,$(LIBDRM_FILES))
-LOCAL_EXPORT_C_INCLUDE_DIRS := \
-        $(LOCAL_PATH) \
-        $(LOCAL_PATH)/include/drm
-LOCAL_C_INCLUDES := \
-        $(LOCAL_PATH)/include/drm
-LOCAL_CFLAGS := \
-        $(common_CFLAGS)
-include $(LIBDRM_COMMON_MK)
-include $(BUILD_SHARED_LIBRARY)
-include $(call all-makefiles-under,$(LOCAL_PATH))
-endif # if TARGET_USE_PRIVATE_LIBDRM is not true

diff --git a/Android.mk b/Android.mk deleted file mode 100644 index 2a980ad0..00000000 --- a/Android.mk +++ /dev/null
@@ -1,133 +0,0 @@
1	#
2	# Copyright © 2011-2012 Intel Corporation
3	#
4	# Permission is hereby granted, free of charge, to any person obtaining a
5	# copy of this software and associated documentation files (the "Software"),
6	# to deal in the Software without restriction, including without limitation
7	# the rights to use, copy, modify, merge, publish, distribute, sublicense,
8	# and/or sell copies of the Software, and to permit persons to whom the
9	# Software is furnished to do so, subject to the following conditions:
10	#
11	# The above copyright notice and this permission notice (including the next
12	# paragraph) shall be included in all copies or substantial portions of the
13	# Software.
14	#
15	# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16	# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17	# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
18	# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19	# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
20	# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
21	# IN THE SOFTWARE.
22	#
23
24	# Two identical libs are defined here.
25	# libdrm: for vendors. installed to /vendor/lib. libdrm_<vendor> uses this.
26	# libdrm_platform: for platform modules (such as libminui). installed to /system/lib
27
28	LIBDRM_COMMON_MK := $(call my-dir)/Android.common.mk
29
30	LOCAL_PATH := $(call my-dir)
31
32	# Import variables LIBDRM_{,H_,INCLUDE_H_,INCLUDE_VMWGFX_H_}FILES
33	include $(LOCAL_PATH)/Makefile.sources
34
35	common_CFLAGS := \
36	-Wall -Werror \
37	-Wno-enum-conversion \
38	-Wno-pointer-arith \
39	-Wno-sign-compare \
40	-Wno-tautological-compare
41
42	# Static library for the device (recovery)
43	include $(CLEAR_VARS)
44
45	LOCAL_MODULE := libdrm_platform
46
47	LOCAL_SRC_FILES := $(filter-out %.h,$(LIBDRM_FILES))
48	LOCAL_EXPORT_C_INCLUDE_DIRS := \
49	$(LOCAL_PATH) \
50	$(LOCAL_PATH)/include/drm
51
52	LOCAL_C_INCLUDES := \
53	$(LOCAL_PATH)/include/drm
54
55	LOCAL_CFLAGS := \
56	$(common_CFLAGS)
57
58	include $(LIBDRM_COMMON_MK)
59	include $(BUILD_STATIC_LIBRARY)
60
61	# Dynamic library for the device
62	include $(CLEAR_VARS)
63
64	LOCAL_MODULE := libdrm_platform
65
66	LOCAL_SRC_FILES := $(filter-out %.h,$(LIBDRM_FILES))
67	LOCAL_EXPORT_C_INCLUDE_DIRS := \
68	$(LOCAL_PATH) \
69	$(LOCAL_PATH)/include/drm
70
71	LOCAL_C_INCLUDES := \
72	$(LOCAL_PATH)/include/drm
73
74	LOCAL_CFLAGS := \
75	$(common_CFLAGS)
76
77	include $(LIBDRM_COMMON_MK)
78	include $(BUILD_SHARED_LIBRARY)
79
80
81	ifneq ($(TARGET_USE_PRIVATE_LIBDRM),true)
82
83	# Import variables LIBDRM_{,H_,INCLUDE_H_,INCLUDE_VMWGFX_H_}FILES
84	include $(LOCAL_PATH)/Makefile.sources
85
86	common_CFLAGS := \
87	-Wno-enum-conversion \
88	-Wno-pointer-arith \
89	-Wno-sign-compare \
90	-Wno-tautological-compare
91
92	# Static library for the device (recovery)
93	include $(CLEAR_VARS)
94
95	LOCAL_MODULE := libdrm
96	LOCAL_VENDOR_MODULE := true
97
98	LOCAL_SRC_FILES := $(filter-out %.h,$(LIBDRM_FILES))
99	LOCAL_EXPORT_C_INCLUDE_DIRS := \
100	$(LOCAL_PATH) \
101	$(LOCAL_PATH)/include/drm
102
103	LOCAL_C_INCLUDES := \
104	$(LOCAL_PATH)/include/drm
105
106	LOCAL_CFLAGS := \
107	$(common_CFLAGS)
108
109	include $(LIBDRM_COMMON_MK)
110	include $(BUILD_STATIC_LIBRARY)
111
112	# Dynamic library for the device
113	include $(CLEAR_VARS)
114
115	LOCAL_MODULE := libdrm
116	LOCAL_VENDOR_MODULE := true
117
118	LOCAL_SRC_FILES := $(filter-out %.h,$(LIBDRM_FILES))
119	LOCAL_EXPORT_C_INCLUDE_DIRS := \
120	$(LOCAL_PATH) \
121	$(LOCAL_PATH)/include/drm
122
123	LOCAL_C_INCLUDES := \
124	$(LOCAL_PATH)/include/drm
125
126	LOCAL_CFLAGS := \
127	$(common_CFLAGS)
128
129	include $(LIBDRM_COMMON_MK)
130	include $(BUILD_SHARED_LIBRARY)
131
132	include $(call all-makefiles-under,$(LOCAL_PATH))
133	endif # if TARGET_USE_PRIVATE_LIBDRM is not true