Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bee59e3b authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Revert "Define vintf_fragments as modules"" into main

parents 71af7d2b 38922741

automotive/remoteaccess/hal/default/Android.bp

+2 −9
Original line number Diff line number Diff line
@@ -51,22 +51,15 @@ 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 {

security/keymint/aidl/default/Android.bp

+10 −31
Original line number Diff line number Diff line
@@ -7,27 +7,6 @@ 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.
@@ -39,6 +18,11 @@ 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",
@@ -67,11 +51,6 @@ 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
@@ -86,6 +65,11 @@ 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",

    ],
@@ -103,11 +87,6 @@ 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 {

tv/tuner/aidl/default/Android.bp

+1 −9
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ package { 
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 @@ 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 {

wifi/aidl/default/Android.bp

+2 −9
Original line number Diff line number Diff line
@@ -112,15 +112,9 @@ 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: [
@@ -143,11 +137,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",
@@ -172,7 +166,6 @@ 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 {