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

Commit 0d913a04 authored by Harshit Mahajan's avatar Harshit Mahajan Committed by Automerger Merge Worker
Browse files

Merge "Add crashrecovery build flag to move files" into main am: be9ab02c am: e1028e77 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2942465



Change-Id: If04bef515df33ac0c7c3d59ba895fd581b43a13d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cb8e3cf6 e1028e77

packages/CrashRecovery/framework/Android.bp

+47 −1
Original line number Diff line number Diff line 
filegroup {

soong_config_module_type {

    name: "platform_filegroup",

    module_type: "filegroup",

    config_namespace: "ANDROID",

    bool_variables: [

        "move_crashrecovery_files",

    ],

    properties: [

        "srcs",

    ],

}



platform_filegroup {

    name: "framework-crashrecovery-sources",

    srcs: [

        "java/**/*.java",

        "java/**/*.aidl",

    ],

    soong_config_variables: {

        // if the flag is enabled, then files would be moved to module

        move_crashrecovery_files: {

            srcs: [],

        },

    },

    path: "java",

    visibility: ["//frameworks/base:__subpackages__"],

}



soong_config_module_type {

    name: "module_filegroup",

    module_type: "filegroup",

    config_namespace: "ANDROID",

    bool_variables: [

        "move_crashrecovery_files",

    ],

    properties: [

        "srcs",

    ],

}



module_filegroup {

    name: "framework-crashrecovery-module-sources",

    srcs: [],

    soong_config_variables: {

        // if the flag is enabled, then files would be moved to module

        move_crashrecovery_files: {

            srcs: [

                "java/**/*.java",

                "java/**/*.aidl",

            ],

        },

    },

    path: "java",

    visibility: ["//packages/modules/CrashRecovery/framework"],

}

packages/CrashRecovery/services/Android.bp

+47 −1
Original line number Diff line number Diff line 
filegroup {

soong_config_module_type {

    name: "platform_filegroup",

    module_type: "filegroup",

    config_namespace: "ANDROID",

    bool_variables: [

        "move_crashrecovery_files",

    ],

    properties: [

        "srcs",

    ],

}



platform_filegroup {

    name: "services-crashrecovery-sources",

    srcs: [

        "java/**/*.java",

        "java/**/*.aidl",

        ":statslog-crashrecovery-java-gen",

    ],

    soong_config_variables: {

        // if the flag is enabled, then files would be moved to module

        move_crashrecovery_files: {

            srcs: [],

        },

    },

    visibility: ["//frameworks/base:__subpackages__"],

}



soong_config_module_type {

    name: "module_filegroup",

    module_type: "filegroup",

    config_namespace: "ANDROID",

    bool_variables: [

        "move_crashrecovery_files",

    ],

    properties: [

        "srcs",

    ],

}



module_filegroup {

    name: "services-crashrecovery-module-sources",

    srcs: [],

    soong_config_variables: {

        // if the flag is enabled, then files would be moved to module

        move_crashrecovery_files: {

            srcs: [

                "java/**/*.java",

                "java/**/*.aidl",

                ":statslog-crashrecovery-java-gen",

            ],

        },

    },

    visibility: ["//packages/modules/CrashRecovery/service"],

}



genrule {

    name: "statslog-crashrecovery-java-gen",

    tools: ["stats-log-api-gen"],