From cf0a2dd5b005fa9353f11e59839cf374bddd1e8b Mon Sep 17 00:00:00 2001 From: Kiyoung Kim Date: Mon, 12 Aug 2024 15:30:48 +0900 Subject: [PATCH] Define vintf_fragments as modules Define vintf_fragments as modules if the file is shared among multiple modules to avoid any conflicts. Bug: 322089980 Test: aosp_cf_x86_64_phone build succeeded Change-Id: I1d00623e3e6da6bb787a152d81eb94822153388f --- .../remoteaccess/hal/default/Android.bp | 11 ++++- security/keymint/aidl/default/Android.bp | 41 ++++++++++++++----- tv/tuner/aidl/default/Android.bp | 10 ++++- wifi/aidl/default/Android.bp | 11 ++++- 4 files changed, 58 insertions(+), 15 deletions(-) diff --git a/automotive/remoteaccess/hal/default/Android.bp b/automotive/remoteaccess/hal/default/Android.bp index cc8f2b0fdd..b6c052596f 100644 --- a/automotive/remoteaccess/hal/default/Android.bp +++ b/automotive/remoteaccess/hal/default/Android.bp @@ -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 { diff --git a/security/keymint/aidl/default/Android.bp b/security/keymint/aidl/default/Android.bp index fbb61401b9..b1679aefdf 100644 --- a/security/keymint/aidl/default/Android.bp +++ b/security/keymint/aidl/default/Android.bp @@ -7,6 +7,27 @@ 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, + 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. @@ -18,11 +39,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 +67,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 +86,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 +103,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 { diff --git a/tv/tuner/aidl/default/Android.bp b/tv/tuner/aidl/default/Android.bp index ed97d9cfc7..4f0d04bfa2 100644 --- a/tv/tuner/aidl/default/Android.bp +++ b/tv/tuner/aidl/default/Android.bp @@ -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 { diff --git a/wifi/aidl/default/Android.bp b/wifi/aidl/default/Android.bp index 2047807063..7f828df2d1 100644 --- a/wifi/aidl/default/Android.bp +++ b/wifi/aidl/default/Android.bp @@ -112,9 +112,15 @@ cc_library_static { 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: [ @@ -137,11 +143,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 +172,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 {