Reapply "Define vintf_fragments as modules"

Previous commit was reverted as it removed wifi vintf fragment from
devices, which was caused by 'no_full_install' property from
vintf_fragment module. This change relands the change, with removing
no_full_install property from the vintf_fragment module

Bug: 322089980
Test: aosp_cf_x86_64_phone build succeeded
Test: mokey_go32 build contains
/vendor/etc/vintf/manifest/android.hardware.wifi.supplicant.xml file

Change-Id: I523ce570068b180805b65f984a0d6def0612db87
This commit is contained in:
Kiyoung Kim
2024-09-03 13:44:23 +09:00
parent bee59e3b47
commit 4a518d2e1e
4 changed files with 54 additions and 15 deletions

View File

@@ -51,15 +51,22 @@ cc_defaults {
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 {

View File

@@ -7,6 +7,24 @@ package {
default_applicable_licenses: ["hardware_interfaces_license"],
}
vintf_fragment {
name: "android.hardware.security.keymint-service.xml",
src: "android.hardware.security.keymint-service.xml",
vendor: true,
}
vintf_fragment {
name: "android.hardware.security.sharedsecret-service.xml",
src: "android.hardware.security.sharedsecret-service.xml",
vendor: true,
}
vintf_fragment {
name: "android.hardware.security.secureclock-service.xml",
src: "android.hardware.security.secureclock-service.xml",
vendor: true,
}
// The following target has an insecure implementation of KeyMint where the
// trusted application (TA) code runs in-process alongside the HAL service
// code.
@@ -18,11 +36,6 @@ cc_binary {
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",
@@ -51,6 +64,11 @@ cc_binary {
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
@@ -65,11 +83,6 @@ rust_binary {
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",
],
@@ -87,6 +100,11 @@ rust_binary {
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 {

View File

@@ -10,7 +10,6 @@ package {
cc_defaults {
name: "tuner_hal_example_defaults",
relative_install_path: "hw",
vintf_fragments: ["tuner-default.xml"],
vendor: true,
compile_multilib: "first",
srcs: [
@@ -43,6 +42,15 @@ cc_defaults {
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 {

View File

@@ -112,9 +112,14 @@ cc_library_static {
export_include_dirs: ["."],
}
vintf_fragment {
name: "android.hardware.wifi-service.xml",
src: "android.hardware.wifi-service.xml",
vendor: true,
}
cc_binary {
name: "android.hardware.wifi-service",
vintf_fragments: ["android.hardware.wifi-service.xml"],
relative_install_path: "hw",
proprietary: true,
cppflags: [
@@ -137,11 +142,11 @@ cc_binary {
],
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",
@@ -166,6 +171,7 @@ cc_binary {
],
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 {