| 修訂 | 7afc31560ad220ac0514aba940b995a3f52b08ac (tree) |
|---|---|
| 時間 | 2020-12-29 19:43:44 |
| 作者 | Roman Stratiienko <r.stratiienko@gmai...> |
| Commiter | Roman Stratiienko |
minigbm: Add dri_generic driver to Android.bp
Depends on mainline mesa3d with
https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8259
merged.
Signed-off-by: Roman Stratiienko <r.stratiienko@gmail.com>
Change-Id: Ic54d3444cdb2a6b536e9faca63ef21e5c592545d
Android.bp (diff)| @@ -6,6 +6,8 @@ cc_defaults { | ||
| 6 | 6 | |
| 7 | 7 | srcs: [ |
| 8 | 8 | "amdgpu.c", |
| 9 | + "dri.c", | |
| 10 | + "dri_generic_driver.c", | |
| 9 | 11 | "drv.c", |
| 10 | 12 | "dumb_driver.c", |
| 11 | 13 | "exynos.c", |
| @@ -20,7 +22,10 @@ cc_defaults { | ||
| 20 | 22 | "virtio_gpu.c", |
| 21 | 23 | ], |
| 22 | 24 | |
| 25 | + include_dirs: ["external/mesa3d/include"], | |
| 26 | + | |
| 23 | 27 | cflags: [ |
| 28 | + "-DDRI_GENERIC_DRV", | |
| 24 | 29 | "-D_GNU_SOURCE=1", |
| 25 | 30 | "-D_FILE_OFFSET_BITS=64", |
| 26 | 31 | "-Wall", |
| @@ -32,6 +37,15 @@ cc_defaults { | ||
| 32 | 37 | ], |
| 33 | 38 | |
| 34 | 39 | cppflags: ["-std=c++14"], |
| 40 | + | |
| 41 | + multilib: { | |
| 42 | + lib32: { | |
| 43 | + cflags: ["-DDRI_DRIVER_DIR=/vendor/lib/dri"], | |
| 44 | + }, | |
| 45 | + lib64: { | |
| 46 | + cflags: ["-DDRI_DRIVER_DIR=/vendor/lib64/dri"], | |
| 47 | + }, | |
| 48 | + }, | |
| 35 | 49 | } |
| 36 | 50 | |
| 37 | 51 | cc_defaults { |
| @@ -61,6 +75,8 @@ cc_defaults { | ||
| 61 | 75 | |
| 62 | 76 | static_libs: ["libarect"], |
| 63 | 77 | |
| 78 | + whole_static_libs: ["libmesa_loader"], | |
| 79 | + | |
| 64 | 80 | export_static_lib_headers: ["libarect"], |
| 65 | 81 | |
| 66 | 82 | vendor: true, |
| @@ -87,28 +103,6 @@ cc_defaults { | ||
| 87 | 103 | export_include_dirs: ["."], |
| 88 | 104 | } |
| 89 | 105 | |
| 90 | -cc_library { | |
| 91 | - name: "libgbm", | |
| 92 | - defaults: ["gbm_defaults"], | |
| 93 | - host_supported: true, | |
| 94 | - | |
| 95 | - target: { | |
| 96 | - host: { | |
| 97 | - // Avoid linking to another host copy of libdrm; this library will cause | |
| 98 | - // binary GPU drivers to be loaded from the host, which might be linked | |
| 99 | - // to a system copy of libdrm, which conflicts with the AOSP one | |
| 100 | - allow_undefined_symbols: true, | |
| 101 | - header_libs: ["libdrm_headers"], | |
| 102 | - }, | |
| 103 | - android: { | |
| 104 | - shared_libs: [ | |
| 105 | - "libdrm", | |
| 106 | - "liblog" | |
| 107 | - ], | |
| 108 | - }, | |
| 109 | - }, | |
| 110 | -} | |
| 111 | - | |
| 112 | 106 | cc_library_static { |
| 113 | 107 | name: "libminigbm_cros_gralloc", |
| 114 | 108 | defaults: ["minigbm_cros_gralloc_defaults"], |
| @@ -122,6 +116,7 @@ cc_library_shared { | ||
| 122 | 116 | name: "gralloc.minigbm", |
| 123 | 117 | defaults: ["minigbm_cros_gralloc_defaults"], |
| 124 | 118 | srcs: ["cros_gralloc/gralloc0/gralloc0.cc"], |
| 119 | + relative_install_path: "hw", | |
| 125 | 120 | } |
| 126 | 121 | |
| 127 | 122 | cc_library_shared { |
| @@ -136,6 +131,7 @@ cc_library_shared { | ||
| 136 | 131 | enabled: true, |
| 137 | 132 | }, |
| 138 | 133 | }, |
| 134 | + relative_install_path: "hw", | |
| 139 | 135 | cflags: ["-DDRV_I915"], |
| 140 | 136 | srcs: ["cros_gralloc/gralloc0/gralloc0.cc"], |
| 141 | 137 | } |
| @@ -143,6 +139,7 @@ cc_library_shared { | ||
| 143 | 139 | cc_library_shared { |
| 144 | 140 | name: "gralloc.minigbm_meson", |
| 145 | 141 | defaults: ["minigbm_cros_gralloc_defaults"], |
| 142 | + relative_install_path: "hw", | |
| 146 | 143 | cflags: ["-DDRV_MESON"], |
| 147 | 144 | srcs: ["cros_gralloc/gralloc0/gralloc0.cc"], |
| 148 | 145 | } |
Android-x86
Fork