lineage-rockchip/android_external_minigbm
1
0
Fork 0
Code Activity Actions

cros_gralloc: move cflags select into minigbm_defaults build rule

Browse source 
from the current libgbm build rule, so that one minigbm build rule
would work for all platforms based on the minigbm platform
soong config varible which is set in the device repository.

Test: boot to homescreen with both msm and generic minigbm
      allocator and mapper versions

Change-Id: I939730626eb478f699b1b099054446f25bb7289c
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
Suggested-by: Jason Macnak <natsu@google.com>
This commit is contained in:
Yongqin Liu 2024-12-12 15:17:03 +08:00
parent 3ad9bbdfda
commit d99636bb60
1 changed files with 21 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

44
Android.bp
View file

@ -69,6 +69,19 @@ filegroup {
srcs: ["cros_gralloc/gralloc0/gralloc0.cc"],
}
generic_cflags = ["-DHAS_DMABUF_SYSTEM_HEAP"]
intel_cflags = [
"-DDRV_I915",
"-DDRV_XE",
]
meson_cflags = ["-DDRV_MESON"]
msm_cflags = [
"-DDRV_MSM",
"-DQCOM_DISABLE_COMPRESSED_NV12",
"-DHAS_DMABUF_SYSTEM_HEAP",
]
arcvm_cflags = ["-DVIRTIO_GPU_NEXT"]
cc_defaults {
name: "minigbm_defaults",
@ -81,7 +94,14 @@ cc_defaults {
"-Wcast-qual",
"-Wcast-align",
"-Wno-unused-parameter",
],
] + select(soong_config_variable("minigbm", "platform"), {
"generic": generic_cflags,
"intel": intel_cflags,
"meson": meson_cflags,
"msm": msm_cflags,
"arcvm": arcvm_cflags,
default: [],
}),
product_variables: {
platform_sdk_version: {
@ -143,19 +163,6 @@ cc_defaults {
srcs: [":minigbm_gralloc0_files"],
}
generic_cflags = ["-DHAS_DMABUF_SYSTEM_HEAP"]
intel_cflags = [
"-DDRV_I915",
"-DDRV_XE",
]
meson_cflags = ["-DDRV_MESON"]
msm_cflags = [
"-DDRV_MSM",
"-DQCOM_DISABLE_COMPRESSED_NV12",
"-DHAS_DMABUF_SYSTEM_HEAP",
]
arcvm_cflags = ["-DVIRTIO_GPU_NEXT"]
cc_library {
name: "libgbm",
defaults: ["minigbm_defaults"],
@ -168,15 +175,6 @@ cc_library {
"minigbm_helpers.c",
],
cflags: select(soong_config_variable("minigbm", "platform"), {
"generic": generic_cflags,
"intel": intel_cflags,
"meson": meson_cflags,
"msm": msm_cflags,
"arcvm": arcvm_cflags,
default: [],
}),
target: {
host: {
// Avoid linking to another host copy of libdrm; this library will cause