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

Commit c5d4fe25 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: I3fde1a7569629ea8bb7ba9a50c59062dca8c8fca
Flag: EXEMPT Refactor Android.bp
parent c8dbe826

services/Android.bp

+13 −3
Original line number Diff line number Diff line
@@ -195,7 +195,17 @@ soong_config_module_type { 
    module_type: "java_library",

    config_namespace: "system_services",

    bool_variables: ["without_vibrator"],

    properties: ["vintf_fragments"],

    properties: ["vintf_fragment_modules"],

}



vintf_fragment {

    name: "manifest_services.xml",

    src: "manifest_services.xml",

}



vintf_fragment {

    name: "manifest_services_android.frameworks.vibrator.xml",

    src: "manifest_services_android.frameworks.vibrator.xml",

}



system_java_library {
@@ -264,11 +274,11 @@ system_java_library { 


    soong_config_variables: {

        without_vibrator: {

            vintf_fragments: [

            vintf_fragment_modules: [

                "manifest_services.xml",

            ],

            conditions_default: {

                vintf_fragments: [

                vintf_fragment_modules: [

                    "manifest_services.xml",

                    "manifest_services_android.frameworks.vibrator.xml",

                ],