Define vintf_fragments as modules

Define vintf_fragments as modules if the file is shared among multiple
modules to avoid any conflicts.

Bug: 322089980
Test: aosp_cf_x86_64_phone build succeeded
Change-Id: I653ed96587445a3e0126b3eee415edce7b657939
This commit is contained in:
Kiyoung Kim 2024-08-12 13:48:01 +09:00
parent ca50f86101
commit 6210dc3d16

View file

@ -79,11 +79,17 @@ cc_defaults {
srcs: [":minigbm_gralloc4_allocator_files"],
}
vintf_fragment {
name: "android.hardware.graphics.allocator@4.0.xml",
src: "android.hardware.graphics.allocator@4.0.xml",
vendor: true,
}
cc_binary {
name: "android.hardware.graphics.allocator@4.0-service.minigbm",
defaults: ["minigbm_gralloc4_allocator_defaults"],
shared_libs: ["libminigbm_gralloc"],
vintf_fragments: ["android.hardware.graphics.allocator@4.0.xml"],
vintf_fragment_modules: ["android.hardware.graphics.allocator@4.0.xml"],
init_rc: ["android.hardware.graphics.allocator@4.0-service.minigbm.rc"],
}
@ -91,7 +97,7 @@ cc_binary {
name: "android.hardware.graphics.allocator@4.0-service.minigbm_msm",
defaults: ["minigbm_gralloc4_allocator_defaults"],
shared_libs: ["libminigbm_gralloc_msm"],
vintf_fragments: ["android.hardware.graphics.allocator@4.0.xml"],
vintf_fragment_modules: ["android.hardware.graphics.allocator@4.0.xml"],
init_rc: ["android.hardware.graphics.allocator@4.0-service.minigbm_msm.rc"],
}
@ -99,7 +105,7 @@ cc_binary {
name: "android.hardware.graphics.allocator@4.0-service.minigbm_arcvm",
defaults: ["minigbm_gralloc4_allocator_defaults"],
shared_libs: ["libminigbm_gralloc_arcvm"],
vintf_fragments: ["android.hardware.graphics.allocator@4.0.xml"],
vintf_fragment_modules: ["android.hardware.graphics.allocator@4.0.xml"],
init_rc: ["android.hardware.graphics.allocator@4.0-service.minigbm_arcvm.rc"],
}
@ -107,7 +113,7 @@ cc_binary {
name: "android.hardware.graphics.allocator@4.0-service.minigbm_intel",
defaults: ["minigbm_gralloc4_allocator_defaults"],
shared_libs: ["libminigbm_gralloc_intel"],
vintf_fragments: ["android.hardware.graphics.allocator@4.0.xml"],
vintf_fragment_modules: ["android.hardware.graphics.allocator@4.0.xml"],
init_rc: ["android.hardware.graphics.allocator@4.0-service.minigbm_intel.rc"],
enabled: false,
arch: {
@ -120,11 +126,17 @@ cc_binary {
},
}
vintf_fragment {
name: "android.hardware.graphics.mapper@4.0.xml",
src: "android.hardware.graphics.mapper@4.0.xml",
vendor: true,
}
cc_library_shared {
name: "android.hardware.graphics.mapper@4.0-impl.minigbm",
defaults: ["minigbm_gralloc4_common_defaults"],
shared_libs: ["libminigbm_gralloc"],
vintf_fragments: ["android.hardware.graphics.mapper@4.0.xml"],
vintf_fragment_modules: ["android.hardware.graphics.mapper@4.0.xml"],
srcs: [":minigbm_gralloc4_mapper_files"],
}
@ -132,7 +144,7 @@ cc_library_shared {
name: "android.hardware.graphics.mapper@4.0-impl.minigbm_msm",
defaults: ["minigbm_gralloc4_common_defaults"],
shared_libs: ["libminigbm_gralloc_msm"],
vintf_fragments: ["android.hardware.graphics.mapper@4.0.xml"],
vintf_fragment_modules: ["android.hardware.graphics.mapper@4.0.xml"],
srcs: [":minigbm_gralloc4_mapper_files"],
}
@ -140,7 +152,7 @@ cc_library_shared {
name: "android.hardware.graphics.mapper@4.0-impl.minigbm_arcvm",
defaults: ["minigbm_gralloc4_common_defaults"],
shared_libs: ["libminigbm_gralloc_arcvm"],
vintf_fragments: ["android.hardware.graphics.mapper@4.0.xml"],
vintf_fragment_modules: ["android.hardware.graphics.mapper@4.0.xml"],
srcs: [":minigbm_gralloc4_mapper_files"],
}
@ -148,7 +160,7 @@ cc_library_shared {
name: "android.hardware.graphics.mapper@4.0-impl.minigbm_intel",
defaults: ["minigbm_gralloc4_common_defaults"],
shared_libs: ["libminigbm_gralloc_intel"],
vintf_fragments: ["android.hardware.graphics.mapper@4.0.xml"],
vintf_fragment_modules: ["android.hardware.graphics.mapper@4.0.xml"],
srcs: [":minigbm_gralloc4_mapper_files"],
enabled: false,
arch: {