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
(cherry picked from https://android-review.googlesource.com/q/commit:8c1af351129febcebea9ddc5f8e584a6a6a3bd97)
Change-Id: I817efd443e49439e4134fca8bd3fd034bbbcc3cc
diff --git a/hostapd/Android.bp b/hostapd/Android.bp
index 8a7dacf..54047f2 100644
--- a/hostapd/Android.bp
+++ b/hostapd/Android.bp
@@ -348,9 +348,10 @@
}
// 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,
}
// Generated by building hostapd_cli and printing LOCAL_SRC_FILES
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
diff --git a/wpa_supplicant/Android.mk b/wpa_supplicant/Android.mk
index 98152be..eb4224b 100644
--- a/wpa_supplicant/Android.mk
+++ b/wpa_supplicant/Android.mk
@@ -1973,7 +1973,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
diff --git a/wpa_supplicant/aidl/Android.bp b/wpa_supplicant/aidl/Android.bp
index 2175462..d523630 100644
--- a/wpa_supplicant/aidl/Android.bp
+++ b/wpa_supplicant/aidl/Android.bp
@@ -59,9 +59,10 @@
],
}
-filegroup {
+vintf_fragment {
name: "android.hardware.wifi.supplicant.xml",
- srcs: ["android.hardware.wifi.supplicant.xml"],
+ src: "android.hardware.wifi.supplicant.xml",
+ soc_specific: true,
}
soong_config_module_type {