commit 92f7d0cb2aedfe0aff5574d7b93ed5fcb96fdedc
author Kiyoung Kim <kiyoungkim@google.com> Mon Aug 12 12:53:08 2024 +0900
committer Kiyoung Kim <kiyoungkim@google.com> Fri Aug 23 04:32:48 2024 +0000
tree 1feb16eb5e0f22a0db3da007694604e86f8f00e5
parent 780b2f17b5f90e91890b16c925f488d33c6ebaf6

Define vintf fragment as a module

Define vintf fragment as a module, so it can be used from multiple
soong-defined modules.

Bug: 322089980
Test: aosp_cf_x86_64_phone build succeeded
Change-Id: I817efd443e49439e4134fca8bd3fd034bbbcc3cc
Merged-In: I817efd443e49439e4134fca8bd3fd034bbbcc3cc

hostapd/Android.bp

diff --git a/hostapd/Android.bp b/hostapd/Android.bp
index 119f66e..f9557b6 100644
--- a/hostapd/Android.bp
+++ b/hostapd/Android.bp
@@ -350,7 +350,8 @@
 }
 
 // This manifest can used by a vendor apex module for hostapd as well.
-filegroup {
+vintf_fragment {
     name: "android.hardware.wifi.hostapd.xml",
-    srcs: ["android.hardware.wifi.hostapd.xml"],
+    src: "android.hardware.wifi.hostapd.xml",
+    soc_specific: true,
 }

hostapd/Android.mk

diff --git a/hostapd/Android.mk b/hostapd/Android.mk
index 35ada83..40c528b 100644
--- a/hostapd/Android.mk
+++ b/hostapd/Android.mk
@@ -1178,7 +1178,7 @@
 LOCAL_MODULE_TAGS := optional
 LOCAL_PROPRIETARY_MODULE := true
 LOCAL_MODULE_RELATIVE_PATH := hw
-LOCAL_VINTF_FRAGMENTS := android.hardware.wifi.hostapd.xml
+LOCAL_REQUIRED_MODULES += android.hardware.wifi.hostapd.xml
 ifdef CONFIG_DRIVER_CUSTOM
 LOCAL_STATIC_LIBRARIES := libCustomWifi
 endif

wpa_supplicant/Android.mk

diff --git a/wpa_supplicant/Android.mk b/wpa_supplicant/Android.mk
index 509dbbc..8acdcd3 100644
--- a/wpa_supplicant/Android.mk
+++ b/wpa_supplicant/Android.mk
@@ -1967,7 +1967,7 @@
 LOCAL_SHARED_LIBRARIES += libutils libbase
 LOCAL_SHARED_LIBRARIES += libbinder_ndk
 LOCAL_STATIC_LIBRARIES += libwpa_aidl
-LOCAL_VINTF_FRAGMENTS := aidl/android.hardware.wifi.supplicant.xml
+LOCAL_REQUIRED_MODULES += android.hardware.wifi.supplicant.xml
 ifeq ($(WIFI_HIDL_UNIFIED_SUPPLICANT_SERVICE_RC_ENTRY), true)
 LOCAL_INIT_RC=aidl/android.hardware.wifi.supplicant-service.rc
 endif

wpa_supplicant/aidl/Android.bp

diff --git a/wpa_supplicant/aidl/Android.bp b/wpa_supplicant/aidl/Android.bp
index 481ad0b..6f26525 100644
--- a/wpa_supplicant/aidl/Android.bp
+++ b/wpa_supplicant/aidl/Android.bp
@@ -56,7 +56,8 @@
     ],
 }
 
-filegroup {
+vintf_fragment {
     name: "android.hardware.wifi.supplicant.xml",
-    srcs: ["android.hardware.wifi.supplicant.xml"],
+    src: "android.hardware.wifi.supplicant.xml",
+    soc_specific: true,
 }