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

Commit d2d3326c authored by Kiyoung Kim's avatar Kiyoung Kim
Browse files

Convert vintf_fragments into vintf_fragment module(s) 

Convert vintf_fragments into vintf_fragment module(s) so those manifests
can be handled in the same way between KATI defined system image and
Soong defined system image.

Bug: 322089980
Test: aosp_cf_x86_64_phone build succeeded
Change-Id: I24f112edf32ea2d0146ebe1d95ba42be28552a6b
parent 5416ffcf

camera/cameraserver/Android.bp

+6 −1
Original line number Diff line number Diff line
@@ -22,6 +22,11 @@ package { 
    default_applicable_licenses: ["frameworks_av_camera_license"],

}



vintf_fragment {

    name: "manifest_android.frameworks.cameraservice.service.xml",

    src: "manifest_android.frameworks.cameraservice.service.xml",

}



cc_binary {

    name: "cameraserver",
@@ -61,7 +66,7 @@ cc_binary { 


    init_rc: ["cameraserver.rc"],



    vintf_fragments: [

    vintf_fragment_modules: [

        "manifest_android.frameworks.cameraservice.service.xml",

    ],

}

media/mediaserver/Android.bp

+6 −1
Original line number Diff line number Diff line
@@ -51,6 +51,11 @@ soong_config_module_type { 
    ],

}



vintf_fragment {

    name: "manifest_media_c2_software.xml",

    src: "manifest_media_c2_software.xml",

}



mediaserver_cc_binary {

    name: "mediaserver",
@@ -88,7 +93,7 @@ mediaserver_cc_binary { 
        "-Wall",

    ],



    vintf_fragments: ["manifest_media_c2_software.xml"],

    vintf_fragment_modules: ["manifest_media_c2_software.xml"],



    soong_config_variables: {

        TARGET_DYNAMIC_64_32_MEDIASERVER: {