aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Willemsen2017-10-20 00:18:23 -0500
committerDan Willemsen2017-10-23 14:27:31 -0500
commitfa32e29a1fe81e5472aabc65d3aa25a5af5aec55 (patch)
treeddc9bf3abee1194215f500913f95229b33b928f7
parentc6ebab75df64ad6ff2be83cd53bb7d02955d7438 (diff)
downloadexternal-libdrm-fa32e29a1fe81e5472aabc65d3aa25a5af5aec55.tar.gz
external-libdrm-fa32e29a1fe81e5472aabc65d3aa25a5af5aec55.tar.xz
external-libdrm-fa32e29a1fe81e5472aabc65d3aa25a5af5aec55.zip
Convert to Android.bp
See build/soong/README.md for more information about Soong. Removes BOARD_GPU_DRIVERS, which wasn't affecting anything, since none of the HAVE_* macros are defined. Even if they were, we'd prefer to compile all of them so that a single library can support multiple boards. Test: mmma external/libdrm Change-Id: Ie01736bce6cf41e3da5040fe5341ade0634b5111
-rw-r--r--Android.bp64
-rw-r--r--Android.common.mk19
-rw-r--r--Android.mk133
-rw-r--r--Android.sources.bp12
-rw-r--r--Android.sources.bp.mk25
-rw-r--r--amdgpu/Android.bp11
-rw-r--r--amdgpu/Android.mk14
-rw-r--r--amdgpu/Android.sources.bp14
-rw-r--r--etnaviv/Android.bp11
-rw-r--r--etnaviv/Android.mk15
-rw-r--r--etnaviv/Android.sources.bp13
-rw-r--r--freedreno/Android.bp11
-rw-r--r--freedreno/Android.mk14
-rw-r--r--freedreno/Android.sources.bp16
-rw-r--r--intel/Android.bp36
-rw-r--r--intel/Android.mk39
-rw-r--r--intel/Android.sources.bp12
-rw-r--r--libkms/Android.bp15
-rw-r--r--libkms/Android.mk56
-rw-r--r--libkms/Android.sources.bp38
-rw-r--r--nouveau/Android.bp11
-rw-r--r--nouveau/Android.mk15
-rw-r--r--nouveau/Android.sources.bp11
-rw-r--r--radeon/Android.bp11
-rw-r--r--radeon/Android.mk15
-rw-r--r--radeon/Android.sources.bp13
-rw-r--r--rockchip/Android.bp13
-rw-r--r--rockchip/Android.mk19
-rw-r--r--tegra/Android.bp14
-rw-r--r--tegra/Android.mk19
-rw-r--r--tests/Android.bp6
-rw-r--r--tests/Android.mk1
-rw-r--r--tests/modetest/Android.bp12
-rw-r--r--tests/modetest/Android.mk16
-rw-r--r--tests/modetest/Android.sources.bp10
-rw-r--r--tests/planetest/Android.bp33
-rw-r--r--tests/planetest/Android.mk27
-rw-r--r--tests/planetest/Android.sources.bp24
-rw-r--r--tests/proptest/Android.bp8
-rw-r--r--tests/proptest/Android.mk16
-rw-r--r--tests/util/Android.bp35
-rw-r--r--tests/util/Android.mk36
-rw-r--r--tests/util/Android.sources.bp10
43 files changed, 489 insertions, 454 deletions
diff --git a/Android.bp b/Android.bp
new file mode 100644
index 00000000..6a90c389
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,64 @@
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
24subdirs = ["*"]
25build = ["Android.sources.bp"]
26
27cc_defaults {
28 name: "libdrm_defaults",
29 cflags: [
30 // XXX: Consider moving these to config.h analogous to autoconf.
31 "-DMAJOR_IN_SYSMACROS=1",
32 "-DHAVE_VISIBILITY=1",
33 "-DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1",
34
35 "-Wall",
36 "-Werror",
37 "-Wno-format",
38 "-Wno-gnu-variable-sized-type-not-at-end",
39 "-Wno-pointer-arith",
40 "-Wno-unused-parameter",
41 "-Wno-unused-variable",
42 "-Wno-missing-field-initializers",
43 ],
44 export_include_dirs: ["."],
45}
46
47// Library for the device
48cc_library {
49 name: "libdrm",
50 vendor_available: true,
51 defaults: [
52 "libdrm_defaults",
53 "libdrm_sources",
54 ],
55
56 export_include_dirs: ["include/drm"],
57
58 cflags: [
59 "-Wno-enum-conversion",
60 "-Wno-pointer-arith",
61 "-Wno-sign-compare",
62 "-Wno-tautological-compare",
63 ],
64}
diff --git a/Android.common.mk b/Android.common.mk
deleted file mode 100644
index 1fe79035..00000000
--- a/Android.common.mk
+++ /dev/null
@@ -1,19 +0,0 @@
1# XXX: Consider moving these to config.h analogous to autoconf.
2LOCAL_CFLAGS += \
3 -DMAJOR_IN_SYSMACROS=1 \
4 -DHAVE_VISIBILITY=1 \
5 -DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1
6
7LOCAL_CFLAGS += \
8 -Wall \
9 -Werror \
10 -Wno-format \
11 -Wno-gnu-variable-sized-type-not-at-end \
12 -Wno-pointer-arith \
13 -Wno-unused-parameter \
14 -Wno-unused-variable \
15 -Wno-missing-field-initializers
16
17# Quiet down the build system and remove any .h files from the sources
18LOCAL_SRC_FILES := $(patsubst %.h, , $(LOCAL_SRC_FILES))
19LOCAL_EXPORT_C_INCLUDE_DIRS += $(LOCAL_PATH)
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
28LIBDRM_COMMON_MK := $(call my-dir)/Android.common.mk
29
30LOCAL_PATH := $(call my-dir)
31
32# Import variables LIBDRM_{,H_,INCLUDE_H_,INCLUDE_VMWGFX_H_}FILES
33include $(LOCAL_PATH)/Makefile.sources
34
35common_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)
43include $(CLEAR_VARS)
44
45LOCAL_MODULE := libdrm_platform
46
47LOCAL_SRC_FILES := $(filter-out %.h,$(LIBDRM_FILES))
48LOCAL_EXPORT_C_INCLUDE_DIRS := \
49 $(LOCAL_PATH) \
50 $(LOCAL_PATH)/include/drm
51
52LOCAL_C_INCLUDES := \
53 $(LOCAL_PATH)/include/drm
54
55LOCAL_CFLAGS := \
56 $(common_CFLAGS)
57
58include $(LIBDRM_COMMON_MK)
59include $(BUILD_STATIC_LIBRARY)
60
61# Dynamic library for the device
62include $(CLEAR_VARS)
63
64LOCAL_MODULE := libdrm_platform
65
66LOCAL_SRC_FILES := $(filter-out %.h,$(LIBDRM_FILES))
67LOCAL_EXPORT_C_INCLUDE_DIRS := \
68 $(LOCAL_PATH) \
69 $(LOCAL_PATH)/include/drm
70
71LOCAL_C_INCLUDES := \
72 $(LOCAL_PATH)/include/drm
73
74LOCAL_CFLAGS := \
75 $(common_CFLAGS)
76
77include $(LIBDRM_COMMON_MK)
78include $(BUILD_SHARED_LIBRARY)
79
80
81ifneq ($(TARGET_USE_PRIVATE_LIBDRM),true)
82
83# Import variables LIBDRM_{,H_,INCLUDE_H_,INCLUDE_VMWGFX_H_}FILES
84include $(LOCAL_PATH)/Makefile.sources
85
86common_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)
93include $(CLEAR_VARS)
94
95LOCAL_MODULE := libdrm
96LOCAL_VENDOR_MODULE := true
97
98LOCAL_SRC_FILES := $(filter-out %.h,$(LIBDRM_FILES))
99LOCAL_EXPORT_C_INCLUDE_DIRS := \
100 $(LOCAL_PATH) \
101 $(LOCAL_PATH)/include/drm
102
103LOCAL_C_INCLUDES := \
104 $(LOCAL_PATH)/include/drm
105
106LOCAL_CFLAGS := \
107 $(common_CFLAGS)
108
109include $(LIBDRM_COMMON_MK)
110include $(BUILD_STATIC_LIBRARY)
111
112# Dynamic library for the device
113include $(CLEAR_VARS)
114
115LOCAL_MODULE := libdrm
116LOCAL_VENDOR_MODULE := true
117
118LOCAL_SRC_FILES := $(filter-out %.h,$(LIBDRM_FILES))
119LOCAL_EXPORT_C_INCLUDE_DIRS := \
120 $(LOCAL_PATH) \
121 $(LOCAL_PATH)/include/drm
122
123LOCAL_C_INCLUDES := \
124 $(LOCAL_PATH)/include/drm
125
126LOCAL_CFLAGS := \
127 $(common_CFLAGS)
128
129include $(LIBDRM_COMMON_MK)
130include $(BUILD_SHARED_LIBRARY)
131
132include $(call all-makefiles-under,$(LOCAL_PATH))
133endif # if TARGET_USE_PRIVATE_LIBDRM is not true
diff --git a/Android.sources.bp b/Android.sources.bp
new file mode 100644
index 00000000..73356dd8
--- /dev/null
+++ b/Android.sources.bp
@@ -0,0 +1,12 @@
1// Autogenerated with Android.sources.bp.mk
2
3cc_defaults {
4 name: "libdrm_sources",
5 srcs: [
6 "xf86drm.c",
7 "xf86drmHash.c",
8 "xf86drmRandom.c",
9 "xf86drmSL.c",
10 "xf86drmMode.c",
11 ],
12}
diff --git a/Android.sources.bp.mk b/Android.sources.bp.mk
new file mode 100644
index 00000000..26b61c1e
--- /dev/null
+++ b/Android.sources.bp.mk
@@ -0,0 +1,25 @@
1# Usage: make -f path/to/Android.sources.bp.mk NAMES=<> >Android.sources.bp
2#
3# It will read the Makefile.sources in the current directory, and
4# write <NAME>_FILES to stdout as an Android.bp cc_defaults module.
5
6.PHONY: all
7all:
8 @# Do nothing
9
10include Makefile.sources
11
12empty :=
13indent := $(empty) $(empty)
14
15$(info // Autogenerated with Android.sources.bp.mk)
16$(foreach NAME,$(NAMES), \
17 $(eval lower_name := $(shell echo $(PREFIX)$(NAME) | tr 'A-Z' 'a-z')) \
18 $(info ) \
19 $(info cc_defaults {) \
20 $(info $(indent)name: "$(lower_name)_sources",) \
21 $(info $(indent)srcs: [) \
22 $(foreach f,$(filter %.c,$($(NAME)_FILES)), \
23 $(info $(indent)$(indent)"$(f)",)) \
24 $(info $(indent)],) \
25 $(info }))
diff --git a/amdgpu/Android.bp b/amdgpu/Android.bp
new file mode 100644
index 00000000..a63b6174
--- /dev/null
+++ b/amdgpu/Android.bp
@@ -0,0 +1,11 @@
1build = ["Android.sources.bp"]
2
3cc_library_shared {
4 name: "libdrm_amdgpu",
5 defaults: [
6 "libdrm_defaults",
7 "libdrm_amdgpu_sources",
8 ],
9 vendor: true,
10 shared_libs: ["libdrm"],
11}
diff --git a/amdgpu/Android.mk b/amdgpu/Android.mk
deleted file mode 100644
index 1df84b3e..00000000
--- a/amdgpu/Android.mk
+++ /dev/null
@@ -1,14 +0,0 @@
1LOCAL_PATH := $(call my-dir)
2include $(CLEAR_VARS)
3
4# Import variables LIBDRM_AMDGPU_FILES, LIBDRM_AMDGPU_H_FILES
5include $(LOCAL_PATH)/Makefile.sources
6
7LOCAL_MODULE := libdrm_amdgpu
8LOCAL_VENDOR_MODULE := true
9LOCAL_SHARED_LIBRARIES := libdrm
10
11LOCAL_SRC_FILES := $(LIBDRM_AMDGPU_FILES)
12
13include $(LIBDRM_COMMON_MK)
14include $(BUILD_SHARED_LIBRARY)
diff --git a/amdgpu/Android.sources.bp b/amdgpu/Android.sources.bp
new file mode 100644
index 00000000..62b8f054
--- /dev/null
+++ b/amdgpu/Android.sources.bp
@@ -0,0 +1,14 @@
1// Autogenerated with Android.sources.bp.mk
2
3cc_defaults {
4 name: "libdrm_amdgpu_sources",
5 srcs: [
6 "amdgpu_bo.c",
7 "amdgpu_cs.c",
8 "amdgpu_device.c",
9 "amdgpu_gpu_info.c",
10 "amdgpu_vamgr.c",
11 "util_hash.c",
12 "util_hash_table.c",
13 ],
14}
diff --git a/etnaviv/Android.bp b/etnaviv/Android.bp
new file mode 100644
index 00000000..21deda99
--- /dev/null
+++ b/etnaviv/Android.bp
@@ -0,0 +1,11 @@
1build = ["Android.sources.bp"]
2
3cc_library_shared {
4 name: "libdrm_etnaviv",
5 defaults: [
6 "libdrm_defaults",
7 "libdrm_etnaviv_sources",
8 ],
9 vendor: true,
10 shared_libs: ["libdrm"],
11}
diff --git a/etnaviv/Android.mk b/etnaviv/Android.mk
deleted file mode 100644
index 1143eac5..00000000
--- a/etnaviv/Android.mk
+++ /dev/null
@@ -1,15 +0,0 @@
1LOCAL_PATH := $(call my-dir)
2include $(CLEAR_VARS)
3
4# Import variables LIBDRM_ETNAVIV_FILES, LIBDRM_ETNAVIV_H_FILES
5include $(LOCAL_PATH)/Makefile.sources
6
7LOCAL_MODULE := libdrm_etnaviv
8LOCAL_VENDOR_MODULE := true
9
10LOCAL_SHARED_LIBRARIES := libdrm
11
12LOCAL_SRC_FILES := $(LIBDRM_ETNAVIV_FILES)
13
14include $(LIBDRM_COMMON_MK)
15include $(BUILD_SHARED_LIBRARY)
diff --git a/etnaviv/Android.sources.bp b/etnaviv/Android.sources.bp
new file mode 100644
index 00000000..aa828900
--- /dev/null
+++ b/etnaviv/Android.sources.bp
@@ -0,0 +1,13 @@
1// Autogenerated with Android.sources.bp.mk
2
3cc_defaults {
4 name: "libdrm_etnaviv_sources",
5 srcs: [
6 "etnaviv_device.c",
7 "etnaviv_gpu.c",
8 "etnaviv_bo.c",
9 "etnaviv_bo_cache.c",
10 "etnaviv_pipe.c",
11 "etnaviv_cmd_stream.c",
12 ],
13}
diff --git a/freedreno/Android.bp b/freedreno/Android.bp
new file mode 100644
index 00000000..9fca9b12
--- /dev/null
+++ b/freedreno/Android.bp
@@ -0,0 +1,11 @@
1build = ["Android.sources.bp"]
2
3cc_library_shared {
4 name: "libdrm_freedreno",
5 defaults: [
6 "libdrm_defaults",
7 "libdrm_freedreno_sources",
8 ],
9 vendor: true,
10 shared_libs: ["libdrm"],
11}
diff --git a/freedreno/Android.mk b/freedreno/Android.mk
deleted file mode 100644
index c1289145..00000000
--- a/freedreno/Android.mk
+++ /dev/null
@@ -1,14 +0,0 @@
1LOCAL_PATH := $(call my-dir)
2include $(CLEAR_VARS)
3
4# Import variables LIBDRM_FREEDRENO_FILES, LIBDRM_FREEDRENO_H_FILES
5include $(LOCAL_PATH)/Makefile.sources
6
7LOCAL_MODULE := libdrm_freedreno
8LOCAL_VENDOR_MODULE := true
9LOCAL_SHARED_LIBRARIES := libdrm
10
11LOCAL_SRC_FILES := $(LIBDRM_FREEDRENO_FILES)
12
13include $(LIBDRM_COMMON_MK)
14include $(BUILD_SHARED_LIBRARY)
diff --git a/freedreno/Android.sources.bp b/freedreno/Android.sources.bp
new file mode 100644
index 00000000..3c1ca316
--- /dev/null
+++ b/freedreno/Android.sources.bp
@@ -0,0 +1,16 @@
1// Autogenerated with Android.sources.bp.mk
2
3cc_defaults {
4 name: "libdrm_freedreno_sources",
5 srcs: [
6 "freedreno_device.c",
7 "freedreno_pipe.c",
8 "freedreno_ringbuffer.c",
9 "freedreno_bo.c",
10 "freedreno_bo_cache.c",
11 "msm/msm_bo.c",
12 "msm/msm_device.c",
13 "msm/msm_pipe.c",
14 "msm/msm_ringbuffer.c",
15 ],
16}
diff --git a/intel/Android.bp b/intel/Android.bp
new file mode 100644
index 00000000..22713acc
--- /dev/null
+++ b/intel/Android.bp
@@ -0,0 +1,36 @@
1//
2// Copyright © 2011 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
24build = ["Android.sources.bp"]
25
26cc_library_shared {
27 name: "libdrm_intel",
28 defaults: [
29 "libdrm_defaults",
30 "libdrm_intel_sources",
31 ],
32 vendor: true,
33
34 // Removed dependency to libpciaccess: not used on Android
35 shared_libs: ["libdrm"],
36}
diff --git a/intel/Android.mk b/intel/Android.mk
deleted file mode 100644
index f8b27dd5..00000000
--- a/intel/Android.mk
+++ /dev/null
@@ -1,39 +0,0 @@
1#
2# Copyright © 2011 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
24LOCAL_PATH := $(call my-dir)
25include $(CLEAR_VARS)
26
27# Import variables LIBDRM_INTEL_FILES, LIBDRM_INTEL_H_FILES
28include $(LOCAL_PATH)/Makefile.sources
29
30LOCAL_MODULE := libdrm_intel
31LOCAL_VENDOR_MODULE := true
32
33# Removed dependency to libpciaccess: not used on Android
34LOCAL_SHARED_LIBRARIES := libdrm
35
36LOCAL_SRC_FILES := $(LIBDRM_INTEL_FILES)
37
38include $(LIBDRM_COMMON_MK)
39include $(BUILD_SHARED_LIBRARY)
diff --git a/intel/Android.sources.bp b/intel/Android.sources.bp
new file mode 100644
index 00000000..459c070f
--- /dev/null
+++ b/intel/Android.sources.bp
@@ -0,0 +1,12 @@
1// Autogenerated with Android.sources.bp.mk
2
3cc_defaults {
4 name: "libdrm_intel_sources",
5 srcs: [
6 "intel_bufmgr.c",
7 "intel_bufmgr_fake.c",
8 "intel_bufmgr_gem.c",
9 "intel_decode.c",
10 "mm.c",
11 ],
12}
diff --git a/libkms/Android.bp b/libkms/Android.bp
new file mode 100644
index 00000000..b09dbf42
--- /dev/null
+++ b/libkms/Android.bp
@@ -0,0 +1,15 @@
1build = ["Android.sources.bp"]
2
3cc_library_shared {
4 name: "libkms",
5 defaults: [
6 "libdrm_defaults",
7 "libkms_sources",
8 "libkms_vmwgfx_sources",
9 "libkms_intel_sources",
10 "libkms_nouveau_sources",
11 "libkms_radeon_sources",
12 ],
13 vendor: true,
14 shared_libs: ["libdrm"],
15}
diff --git a/libkms/Android.mk b/libkms/Android.mk
deleted file mode 100644
index 8a38ad54..00000000
--- a/libkms/Android.mk
+++ /dev/null
@@ -1,56 +0,0 @@
1DRM_GPU_DRIVERS := $(strip $(filter-out swrast, $(BOARD_GPU_DRIVERS)))
2
3intel_drivers := i915 i965 i915g ilo
4radeon_drivers := r300g r600g radeonsi
5rockchip_drivers := rockchip
6nouveau_drivers := nouveau
7virgl_drivers := virgl
8vmwgfx_drivers := vmwgfx
9tegra_drivers := tegra
10
11valid_drivers := \
12 $(intel_drivers) \
13 $(radeon_drivers) \
14 $(rockchip_drivers) \
15 $(nouveau_drivers) \
16 $(virgl_drivers) \
17 $(vmwgfx_drivers) \
18 $(tegra_drivers)
19
20# warn about invalid drivers
21invalid_drivers := $(filter-out $(valid_drivers), $(DRM_GPU_DRIVERS))
22ifneq ($(invalid_drivers),)
23$(warning invalid GPU drivers: $(invalid_drivers))
24# tidy up
25DRM_GPU_DRIVERS := $(filter-out $(invalid_drivers), $(DRM_GPU_DRIVERS))
26endif
27
28LOCAL_PATH := $(call my-dir)
29
30include $(CLEAR_VARS)
31include $(LOCAL_PATH)/Makefile.sources
32
33LOCAL_SRC_FILES := $(LIBKMS_FILES)
34
35ifneq ($(filter $(vmwgfx_drivers), $(DRM_GPU_DRIVERS)),)
36LOCAL_SRC_FILES += $(LIBKMS_VMWGFX_FILES)
37endif
38
39ifneq ($(filter $(intel_drivers), $(DRM_GPU_DRIVERS)),)
40LOCAL_SRC_FILES += $(LIBKMS_INTEL_FILES)
41endif
42
43ifneq ($(filter $(nouveau_drivers), $(DRM_GPU_DRIVERS)),)
44LOCAL_SRC_FILES += $(LIBKMS_NOUVEAU_FILES)
45endif
46
47ifneq ($(filter $(radeon_drivers), $(DRM_GPU_DRIVERS)),)
48LOCAL_SRC_FILES += $(LIBKMS_RADEON_FILES)
49endif
50
51LOCAL_MODULE := libkms
52LOCAL_VENDOR_MODULE := true
53LOCAL_SHARED_LIBRARIES := libdrm
54
55include $(LIBDRM_COMMON_MK)
56include $(BUILD_SHARED_LIBRARY)
diff --git a/libkms/Android.sources.bp b/libkms/Android.sources.bp
new file mode 100644
index 00000000..5582f235
--- /dev/null
+++ b/libkms/Android.sources.bp
@@ -0,0 +1,38 @@
1// Autogenerated with Android.sources.bp.mk
2
3cc_defaults {
4 name: "libkms_sources",
5 srcs: [
6 "linux.c",
7 "dumb.c",
8 "api.c",
9 ],
10}
11
12cc_defaults {
13 name: "libkms_vmwgfx_sources",
14 srcs: [
15 "vmwgfx.c",
16 ],
17}
18
19cc_defaults {
20 name: "libkms_intel_sources",
21 srcs: [
22 "intel.c",
23 ],
24}
25
26cc_defaults {
27 name: "libkms_nouveau_sources",
28 srcs: [
29 "nouveau.c",
30 ],
31}
32
33cc_defaults {
34 name: "libkms_radeon_sources",
35 srcs: [
36 "radeon.c",
37 ],
38}
diff --git a/nouveau/Android.bp b/nouveau/Android.bp
new file mode 100644
index 00000000..12c37e3d
--- /dev/null
+++ b/nouveau/Android.bp
@@ -0,0 +1,11 @@
1build = ["Android.sources.bp"]
2
3cc_library_shared {
4 name: "libdrm_nouveau",
5 defaults: [
6 "libdrm_defaults",
7 "libdrm_nouveau_sources",
8 ],
9 vendor: true,
10 shared_libs: ["libdrm"],
11}
diff --git a/nouveau/Android.mk b/nouveau/Android.mk
deleted file mode 100644
index 27433d87..00000000
--- a/nouveau/Android.mk
+++ /dev/null
@@ -1,15 +0,0 @@
1LOCAL_PATH := $(call my-dir)
2include $(CLEAR_VARS)
3
4# Import variables LIBDRM_NOUVEAU_FILES, LIBDRM_NOUVEAU_H_FILES
5include $(LOCAL_PATH)/Makefile.sources
6
7LOCAL_MODULE := libdrm_nouveau
8LOCAL_VENDOR_MODULE := true
9
10LOCAL_SHARED_LIBRARIES := libdrm
11
12LOCAL_SRC_FILES := $(LIBDRM_NOUVEAU_FILES)
13
14include $(LIBDRM_COMMON_MK)
15include $(BUILD_SHARED_LIBRARY)
diff --git a/nouveau/Android.sources.bp b/nouveau/Android.sources.bp
new file mode 100644
index 00000000..5ecdb53c
--- /dev/null
+++ b/nouveau/Android.sources.bp
@@ -0,0 +1,11 @@
1// Autogenerated with Android.sources.bp.mk
2
3cc_defaults {
4 name: "libdrm_nouveau_sources",
5 srcs: [
6 "nouveau.c",
7 "pushbuf.c",
8 "bufctx.c",
9 "abi16.c",
10 ],
11}
diff --git a/radeon/Android.bp b/radeon/Android.bp
new file mode 100644
index 00000000..9d0a09ec
--- /dev/null
+++ b/radeon/Android.bp
@@ -0,0 +1,11 @@
1build = ["Android.sources.bp"]
2
3cc_library_shared {
4 name: "libdrm_radeon",
5 defaults: [
6 "libdrm_defaults",
7 "libdrm_radeon_sources",
8 ],
9 vendor: true,
10 shared_libs: ["libdrm"],
11}
diff --git a/radeon/Android.mk b/radeon/Android.mk
deleted file mode 100644
index 7bc9cee9..00000000
--- a/radeon/Android.mk
+++ /dev/null
@@ -1,15 +0,0 @@
1LOCAL_PATH := $(call my-dir)
2include $(CLEAR_VARS)
3
4# Import variables LIBDRM_RADEON_FILES, LIBDRM_RADEON_H_FILES
5include $(LOCAL_PATH)/Makefile.sources
6
7LOCAL_MODULE := libdrm_radeon
8LOCAL_VENDOR_MODULE := true
9
10LOCAL_SHARED_LIBRARIES := libdrm
11
12LOCAL_SRC_FILES := $(LIBDRM_RADEON_FILES)
13
14include $(LIBDRM_COMMON_MK)
15include $(BUILD_SHARED_LIBRARY)
diff --git a/radeon/Android.sources.bp b/radeon/Android.sources.bp
new file mode 100644
index 00000000..820ac4d6
--- /dev/null
+++ b/radeon/Android.sources.bp
@@ -0,0 +1,13 @@
1// Autogenerated with Android.sources.bp.mk
2
3cc_defaults {
4 name: "libdrm_radeon_sources",
5 srcs: [
6 "radeon_bo_gem.c",
7 "radeon_cs_gem.c",
8 "radeon_cs_space.c",
9 "radeon_bo.c",
10 "radeon_cs.c",
11 "radeon_surface.c",
12 ],
13}
diff --git a/rockchip/Android.bp b/rockchip/Android.bp
new file mode 100644
index 00000000..daceacca
--- /dev/null
+++ b/rockchip/Android.bp
@@ -0,0 +1,13 @@
1cc_library_shared {
2 name: "libdrm_rockchip",
3 vendor: true,
4 shared_libs: ["libdrm"],
5
6 srcs: ["rockchip_drm.c"],
7
8 cflags: [
9 "-DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1",
10 "-Wall",
11 "-Werror",
12 ],
13}
diff --git a/rockchip/Android.mk b/rockchip/Android.mk
deleted file mode 100644
index 8f561cd9..00000000
--- a/rockchip/Android.mk
+++ /dev/null
@@ -1,19 +0,0 @@
1LOCAL_PATH := $(call my-dir)
2include $(CLEAR_VARS)
3
4LOCAL_MODULE := libdrm_rockchip
5
6LOCAL_SHARED_LIBRARIES := libdrm
7
8LOCAL_SRC_FILES := rockchip_drm.c
9
10LOCAL_CFLAGS := \
11 -DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1 \
12 -Wall -Werror
13
14LOCAL_SHARED_LIBRARIES := \
15 libdrm
16
17LOCAL_VENDOR_MODULE := true
18
19include $(BUILD_SHARED_LIBRARY)
diff --git a/tegra/Android.bp b/tegra/Android.bp
new file mode 100644
index 00000000..33eaf6c5
--- /dev/null
+++ b/tegra/Android.bp
@@ -0,0 +1,14 @@
1cc_library_shared {
2 name: "libdrm_tegra",
3 vendor: true,
4 shared_libs: ["libdrm"],
5
6 srcs: ["tegra.c"],
7
8 cflags: [
9 "-DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1",
10 "-Wall",
11 "-Werror",
12 "-Wno-unused-variable",
13 ],
14}
diff --git a/tegra/Android.mk b/tegra/Android.mk
deleted file mode 100644
index cae4ff68..00000000
--- a/tegra/Android.mk
+++ /dev/null
@@ -1,19 +0,0 @@
1LOCAL_PATH := $(call my-dir)
2include $(CLEAR_VARS)
3
4LOCAL_MODULE := libdrm_tegra
5
6LOCAL_SHARED_LIBRARIES := libdrm
7
8LOCAL_SRC_FILES := tegra.c
9
10LOCAL_CFLAGS := \
11 -DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1 \
12 -Wall -Werror -Wno-unused-variable
13
14LOCAL_SHARED_LIBRARIES := \
15 libdrm
16
17LOCAL_VENDOR_MODULE := true
18
19include $(BUILD_SHARED_LIBRARY)
diff --git a/tests/Android.bp b/tests/Android.bp
new file mode 100644
index 00000000..cdc6c2cf
--- /dev/null
+++ b/tests/Android.bp
@@ -0,0 +1,6 @@
1subdirs = ["*"]
2
3cc_library_headers {
4 name: "libdrm_test_headers",
5 export_include_dirs: ["."],
6}
diff --git a/tests/Android.mk b/tests/Android.mk
deleted file mode 100644
index 5053e7d6..00000000
--- a/tests/Android.mk
+++ /dev/null
@@ -1 +0,0 @@
1include $(call all-subdir-makefiles)
diff --git a/tests/modetest/Android.bp b/tests/modetest/Android.bp
new file mode 100644
index 00000000..ca811fee
--- /dev/null
+++ b/tests/modetest/Android.bp
@@ -0,0 +1,12 @@
1build = ["Android.sources.bp"]
2
3cc_test {
4 name: "modetest",
5 defaults: [
6 "libdrm_defaults",
7 "modetest_sources",
8 ],
9
10 shared_libs: ["libdrm"],
11 static_libs: ["libdrm_util"],
12}
diff --git a/tests/modetest/Android.mk b/tests/modetest/Android.mk
deleted file mode 100644
index 4f9b02d3..00000000
--- a/tests/modetest/Android.mk
+++ /dev/null
@@ -1,16 +0,0 @@
1LOCAL_PATH := $(call my-dir)
2
3include $(CLEAR_VARS)
4include $(LOCAL_PATH)/Makefile.sources
5
6LOCAL_SRC_FILES := $(filter-out %.h,$(MODETEST_FILES))
7
8LOCAL_MODULE := modetest
9
10LOCAL_SHARED_LIBRARIES := libdrm_platform
11LOCAL_STATIC_LIBRARIES := libdrm_util
12
13LOCAL_C_INCLUDES := $(LOCAL_PATH)/..
14
15include $(LIBDRM_COMMON_MK)
16include $(BUILD_EXECUTABLE)
diff --git a/tests/modetest/Android.sources.bp b/tests/modetest/Android.sources.bp
new file mode 100644
index 00000000..c6aca2ef
--- /dev/null
+++ b/tests/modetest/Android.sources.bp
@@ -0,0 +1,10 @@
1// Autogenerated with Android.sources.bp.mk
2
3cc_defaults {
4 name: "modetest_sources",
5 srcs: [
6 "buffers.c",
7 "cursor.c",
8 "modetest.c",
9 ],
10}
diff --git a/tests/planetest/Android.bp b/tests/planetest/Android.bp
new file mode 100644
index 00000000..16dfc5b7
--- /dev/null
+++ b/tests/planetest/Android.bp
@@ -0,0 +1,33 @@
1build = ["Android.sources.bp"]
2
3cc_test {
4 name: "planetest",
5 defaults: [
6 "planetest_common_sources",
7 "planetest_sources",
8 ],
9 shared_libs: ["libdrm"],
10
11 cflags: [
12 "-Wall",
13 "-Werror",
14 "-Wno-unused-parameter",
15 "-Wno-pointer-arith",
16 ],
17}
18
19cc_test {
20 name: "atomictest",
21 defaults: [
22 "planetest_common_sources",
23 "atomictest_sources",
24 ],
25 shared_libs: ["libdrm"],
26
27 cflags: [
28 "-Wall",
29 "-Werror",
30 "-Wno-unused-parameter",
31 "-Wno-pointer-arith",
32 ],
33}
diff --git a/tests/planetest/Android.mk b/tests/planetest/Android.mk
deleted file mode 100644
index 0c30968a..00000000
--- a/tests/planetest/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
1LOCAL_PATH := $(call my-dir)
2
3include $(CLEAR_VARS)
4include $(LOCAL_PATH)/Makefile.sources
5
6LOCAL_CFLAGS := -Wall -Werror -Wno-unused-parameter -Wno-pointer-arith
7
8LOCAL_SRC_FILES := $(filter-out %.h,$(PLANETEST_COMMON_FILES) $(PLANETEST_FILES))
9
10LOCAL_MODULE := planetest
11
12LOCAL_SHARED_LIBRARIES := libdrm_platform
13
14include $(BUILD_EXECUTABLE)
15
16include $(CLEAR_VARS)
17include $(LOCAL_PATH)/Makefile.sources
18
19LOCAL_CFLAGS := -Wall -Werror -Wno-unused-parameter -Wno-pointer-arith
20
21LOCAL_SRC_FILES := $(filter-out %.h,$(PLANETEST_COMMON_FILES) $(ATOMICTEST_FILES))
22
23LOCAL_MODULE := atomictest
24
25LOCAL_SHARED_LIBRARIES := libdrm_platform
26
27include $(BUILD_EXECUTABLE)
diff --git a/tests/planetest/Android.sources.bp b/tests/planetest/Android.sources.bp
new file mode 100644
index 00000000..4a35bb51
--- /dev/null
+++ b/tests/planetest/Android.sources.bp
@@ -0,0 +1,24 @@
1// Autogenerated with Android.sources.bp.mk
2
3cc_defaults {
4 name: "planetest_common_sources",
5 srcs: [
6 "bo.c",
7 "dev.c",
8 "modeset.c",
9 ],
10}
11
12cc_defaults {
13 name: "planetest_sources",
14 srcs: [
15 "planetest.c",
16 ],
17}
18
19cc_defaults {
20 name: "atomictest_sources",
21 srcs: [
22 "atomictest.c",
23 ],
24}
diff --git a/tests/proptest/Android.bp b/tests/proptest/Android.bp
new file mode 100644
index 00000000..28c87e91
--- /dev/null
+++ b/tests/proptest/Android.bp
@@ -0,0 +1,8 @@
1cc_test {
2 name: "proptest",
3 defaults: ["libdrm_defaults"],
4 srcs: ["proptest.c"],
5
6 shared_libs: ["libdrm"],
7 static_libs: ["libdrm_util"],
8}
diff --git a/tests/proptest/Android.mk b/tests/proptest/Android.mk
deleted file mode 100644
index eaada3b1..00000000
--- a/tests/proptest/Android.mk
+++ /dev/null
@@ -1,16 +0,0 @@
1LOCAL_PATH := $(call my-dir)
2
3include $(CLEAR_VARS)
4include $(LOCAL_PATH)/Makefile.sources
5
6LOCAL_SRC_FILES := $(PROPTEST_FILES)
7
8LOCAL_MODULE := proptest
9
10LOCAL_SHARED_LIBRARIES := libdrm_platform
11LOCAL_STATIC_LIBRARIES := libdrm_util
12
13LOCAL_C_INCLUDES := $(LOCAL_PATH)/..
14
15include $(LIBDRM_COMMON_MK)
16include $(BUILD_EXECUTABLE)
diff --git a/tests/util/Android.bp b/tests/util/Android.bp
new file mode 100644
index 00000000..36d18206
--- /dev/null
+++ b/tests/util/Android.bp
@@ -0,0 +1,35 @@
1//
2// Copyright © 2015 NVIDIA 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
24build = ["Android.sources.bp"]
25
26cc_library_static {
27 name: "libdrm_util",
28 defaults: [
29 "libdrm_defaults",
30 "libdrm_util_sources",
31 ],
32 shared_libs: ["libdrm"],
33 header_libs: ["libdrm_test_headers"],
34 export_header_lib_headers: ["libdrm_test_headers"],
35}
diff --git a/tests/util/Android.mk b/tests/util/Android.mk
deleted file mode 100644
index 44c524d2..00000000
--- a/tests/util/Android.mk
+++ /dev/null
@@ -1,36 +0,0 @@
1#
2# Copyright © 2015 NVIDIA 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
24LOCAL_PATH := $(call my-dir)
25
26include $(CLEAR_VARS)
27include $(LOCAL_PATH)/Makefile.sources
28
29LOCAL_MODULE := libdrm_util
30
31LOCAL_SHARED_LIBRARIES := libdrm_platform
32
33LOCAL_SRC_FILES := $(UTIL_FILES)
34
35include $(LIBDRM_COMMON_MK)
36include $(BUILD_STATIC_LIBRARY)
diff --git a/tests/util/Android.sources.bp b/tests/util/Android.sources.bp
new file mode 100644
index 00000000..529e1124
--- /dev/null
+++ b/tests/util/Android.sources.bp
@@ -0,0 +1,10 @@
1// Autogenerated with Android.sources.bp.mk
2
3cc_defaults {
4 name: "libdrm_util_sources",
5 srcs: [
6 "format.c",
7 "kms.c",
8 "pattern.c",
9 ],
10}