Merge "cros_gralloc: move cflags select into minigbm_defaults build rule" into main am: fefcc1b9da
Original change: https://android-review.googlesource.com/c/platform/external/minigbm/+/3517291 Change-Id: Id93558ab8142bd5c4551a74fb04da999136588af Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
c07a3f5090
1 changed files with 21 additions and 23 deletions
44
Android.bp
44
Android.bp
|
|
@ -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"],
|
||||
|
|
@ -169,15 +176,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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue