Revert "Define vintf_fragments as modules"
This reverts commit cf0a2dd5b005fa9353f11e59839cf374bddd1e8b.
Reason for revert: b/363215494, breaks WiFi for at least some devices
Change-Id: I5137957087dde51c0049416404f410f53dd912f3
diff --git a/wifi/aidl/default/Android.bp b/wifi/aidl/default/Android.bp
index 7f828df..2047807 100644
--- a/wifi/aidl/default/Android.bp
+++ b/wifi/aidl/default/Android.bp
@@ -112,15 +112,9 @@
export_include_dirs: ["."],
}
-vintf_fragment {
- name: "android.hardware.wifi-service.xml",
- src: "android.hardware.wifi-service.xml",
- vendor: true,
- no_full_install: true,
-}
-
cc_binary {
name: "android.hardware.wifi-service",
+ vintf_fragments: ["android.hardware.wifi-service.xml"],
relative_install_path: "hw",
proprietary: true,
cppflags: [
@@ -143,11 +137,11 @@
],
static_libs: ["android.hardware.wifi-service-lib"],
init_rc: ["android.hardware.wifi-service.rc"],
- vintf_fragment_modules: ["android.hardware.wifi-service.xml"],
}
cc_binary {
name: "android.hardware.wifi-service-lazy",
+ vintf_fragments: ["android.hardware.wifi-service.xml"],
overrides: ["android.hardware.wifi-service"],
cflags: ["-DLAZY_SERVICE"],
relative_install_path: "hw",
@@ -172,7 +166,6 @@
],
static_libs: ["android.hardware.wifi-service-lib"],
init_rc: ["android.hardware.wifi-service-lazy.rc"],
- vintf_fragment_modules: ["android.hardware.wifi-service.xml"],
}
cc_test {