Snap for 13722806 from 9f2c22f6e9 to 25Q4-release

Change-Id: I2bf636cb476563a9e57f3b05058b99a91e24e87b
This commit is contained in:
Android Build Coastguard Worker 2025-07-01 16:12:26 -07:00
commit 7a3ceeda34
3 changed files with 0 additions and 36 deletions

View file

@ -80,7 +80,6 @@ msm_cflags = [
"-DHAS_DMABUF_SYSTEM_HEAP",
"-DQCOM_DISABLE_COMPRESSED_NV12",
]
arcvm_cflags = ["-DVIRTIO_GPU_NEXT"]
mediatek_cflags = [
"-DDRV_MEDIATEK",
@ -104,7 +103,6 @@ cc_defaults {
"intel": intel_cflags,
"meson": meson_cflags,
"msm": msm_cflags,
"arcvm": arcvm_cflags,
"mt8186": mediatek_cflags + ["-DMTK_MT8186"],
"mt8188": mediatek_cflags + ["-DMTK_MT8188G"],
"mt8196": mediatek_cflags + ["-DMTK_MT8196"],
@ -318,16 +316,3 @@ cc_library_shared {
defaults: ["minigbm_cros_gralloc0_defaults"],
shared_libs: ["libminigbm_gralloc_msm"],
}
// ARCVM
cc_library_shared {
name: "libminigbm_gralloc_arcvm",
defaults: ["minigbm_cros_gralloc_library_defaults"],
cflags: arcvm_cflags,
}
cc_library_shared {
name: "gralloc.minigbm_arcvm",
defaults: ["minigbm_cros_gralloc0_defaults"],
shared_libs: ["libminigbm_gralloc_arcvm"],
}

View file

@ -101,14 +101,6 @@ cc_binary {
init_rc: ["android.hardware.graphics.allocator@4.0-service.minigbm_msm.rc"],
}
cc_binary {
name: "android.hardware.graphics.allocator@4.0-service.minigbm_arcvm",
defaults: ["minigbm_gralloc4_allocator_defaults"],
shared_libs: ["libminigbm_gralloc_arcvm"],
vintf_fragment_modules: ["android.hardware.graphics.allocator@4.0.xml"],
init_rc: ["android.hardware.graphics.allocator@4.0-service.minigbm_arcvm.rc"],
}
cc_binary {
name: "android.hardware.graphics.allocator@4.0-service.minigbm_intel",
defaults: ["minigbm_gralloc4_allocator_defaults"],
@ -148,14 +140,6 @@ cc_library_shared {
srcs: [":minigbm_gralloc4_mapper_files"],
}
cc_library_shared {
name: "android.hardware.graphics.mapper@4.0-impl.minigbm_arcvm",
defaults: ["minigbm_gralloc4_common_defaults"],
shared_libs: ["libminigbm_gralloc_arcvm"],
vintf_fragment_modules: ["android.hardware.graphics.mapper@4.0.xml"],
srcs: [":minigbm_gralloc4_mapper_files"],
}
cc_library_shared {
name: "android.hardware.graphics.mapper@4.0-impl.minigbm_intel",
defaults: ["minigbm_gralloc4_common_defaults"],

View file

@ -955,11 +955,6 @@ static bool should_use_blob(struct driver *drv, uint32_t format, uint64_t use_fl
{
struct virgl_priv *priv = (struct virgl_priv *)drv->priv;
// TODO(gurchetansingh): remove once all minigbm users are blob-safe
#ifndef VIRTIO_GPU_NEXT
return false;
#endif
// Only use blob when host gbm is available
if (!priv->host_gbm_enabled)
return false;