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

Commit e9515c50 authored by Kiyoung Kim's avatar Kiyoung Kim Committed by Automerger Merge Worker
Browse files

Merge "Convert vintf_fragments into vintf_fragment module(s)" into main am:... 

Merge "Convert vintf_fragments into vintf_fragment module(s)" into main am: 9acb9195 am: 59d9e705

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/3304361



Change-Id: I891e65f8cf1b8822223ede87213ff618ab03cda1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 85dde5bf 59d9e705

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: {