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/automotive/remoteaccess/hal/default/Android.bp b/automotive/remoteaccess/hal/default/Android.bp
index b6c0525..cc8f2b0 100644
--- a/automotive/remoteaccess/hal/default/Android.bp
+++ b/automotive/remoteaccess/hal/default/Android.bp
@@ -51,22 +51,15 @@
cc_binary {
name: "android.hardware.automotive.remoteaccess@V2-default-service",
defaults: ["remote-access-hal-defaults"],
+ vintf_fragments: ["remoteaccess-default-service.xml"],
init_rc: ["remoteaccess-default-service.rc"],
- vintf_fragment_modules: ["remoteaccess-default-service.xml"],
-
}
cc_binary {
name: "android.hardware.automotive.remoteaccess@V2-tcu-test-service",
defaults: ["remote-access-hal-defaults"],
+ vintf_fragments: ["remoteaccess-default-service.xml"],
init_rc: ["remoteaccess-tcu-test-service.rc"],
- vintf_fragment_modules: ["remoteaccess-default-service.xml"],
-}
-
-vintf_fragment {
- name: "remoteaccess-default-service.xml",
- src: "remoteaccess-default-service.xml",
- vendor: true,
}
cc_library {
diff --git a/security/keymint/aidl/default/Android.bp b/security/keymint/aidl/default/Android.bp
index b1679ae..fbb6140 100644
--- a/security/keymint/aidl/default/Android.bp
+++ b/security/keymint/aidl/default/Android.bp
@@ -7,27 +7,6 @@
default_applicable_licenses: ["hardware_interfaces_license"],
}
-vintf_fragment {
- name: "android.hardware.security.keymint-service.xml",
- src: "android.hardware.security.keymint-service.xml",
- vendor: true,
- no_full_install: true,
-}
-
-vintf_fragment {
- name: "android.hardware.security.sharedsecret-service.xml",
- src: "android.hardware.security.sharedsecret-service.xml",
- vendor: true,
- no_full_install: true,
-}
-
-vintf_fragment {
- name: "android.hardware.security.secureclock-service.xml",
- src: "android.hardware.security.secureclock-service.xml",
- vendor: true,
- no_full_install: true,
-}
-
// The following target has an insecure implementation of KeyMint where the
// trusted application (TA) code runs in-process alongside the HAL service
// code.
@@ -39,6 +18,11 @@
name: "android.hardware.security.keymint-service",
relative_install_path: "hw",
init_rc: ["android.hardware.security.keymint-service.rc"],
+ vintf_fragments: [
+ "android.hardware.security.keymint-service.xml",
+ "android.hardware.security.sharedsecret-service.xml",
+ "android.hardware.security.secureclock-service.xml",
+ ],
vendor: true,
cflags: [
"-Wall",
@@ -67,11 +51,6 @@
required: [
"android.hardware.hardware_keystore.xml",
],
- vintf_fragment_modules: [
- "android.hardware.security.keymint-service.xml",
- "android.hardware.security.sharedsecret-service.xml",
- "android.hardware.security.secureclock-service.xml",
- ],
}
// The following target has an insecure implementation of KeyMint where the
@@ -86,6 +65,11 @@
relative_install_path: "hw",
vendor: true,
init_rc: ["android.hardware.security.keymint-service.nonsecure.rc"],
+ vintf_fragments: [
+ "android.hardware.security.keymint-service.xml",
+ "android.hardware.security.sharedsecret-service.xml",
+ "android.hardware.security.secureclock-service.xml",
+ ],
defaults: [
"keymint_use_latest_hal_aidl_rust",
],
@@ -103,11 +87,6 @@
required: [
"android.hardware.hardware_keystore.xml",
],
- vintf_fragment_modules: [
- "android.hardware.security.keymint-service.xml",
- "android.hardware.security.sharedsecret-service.xml",
- "android.hardware.security.secureclock-service.xml",
- ],
}
prebuilt_etc {
diff --git a/tv/tuner/aidl/default/Android.bp b/tv/tuner/aidl/default/Android.bp
index 4f0d04b..ed97d9c 100644
--- a/tv/tuner/aidl/default/Android.bp
+++ b/tv/tuner/aidl/default/Android.bp
@@ -10,6 +10,7 @@
cc_defaults {
name: "tuner_hal_example_defaults",
relative_install_path: "hw",
+ vintf_fragments: ["tuner-default.xml"],
vendor: true,
compile_multilib: "first",
srcs: [
@@ -42,15 +43,6 @@
header_libs: [
"media_plugin_headers",
],
- vintf_fragment_modules: [
- "tuner-default.xml",
- ],
-}
-
-vintf_fragment {
- name: "tuner-default.xml",
- src: "tuner-default.xml",
- vendor: true,
}
cc_binary {
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 {