From 6210dc3d16841bcbbb0da9f344527be23de01297 Mon Sep 17 00:00:00 2001
From: Kiyoung Kim <kiyoungkim@google.com>
Date: Mon, 12 Aug 2024 13:48:01 +0900
Subject: [PATCH] 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
---
 cros_gralloc/gralloc4/Android.bp | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/cros_gralloc/gralloc4/Android.bp b/cros_gralloc/gralloc4/Android.bp
index fb6aca9..73588f7 100644
--- a/cros_gralloc/gralloc4/Android.bp
+++ b/cros_gralloc/gralloc4/Android.bp
@@ -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: {