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

Commit f65d3c95 authored by Harshit Mahajan's avatar Harshit Mahajan Committed by Gerrit Code Review
Browse files

Merge "Add crashrecovery build flag to move files" into main

parents eff37cd8 16ef3cb8

packages/CrashRecovery/framework/Android.bp

+10 −12
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ soong_config_module_type { 
    module_type: "filegroup",

    config_namespace: "ANDROID",

    bool_variables: [

        "move_crashrecovery_files",

        "crashrecovery_files_in_platform",

    ],

    properties: [

        "srcs",
@@ -12,14 +12,13 @@ soong_config_module_type { 


platform_filegroup {

    name: "framework-crashrecovery-sources",

    soong_config_variables: {

        // if this flag is enabled, then files are part of platform

        crashrecovery_files_in_platform: {

            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",
@@ -31,7 +30,7 @@ soong_config_module_type { 
    module_type: "filegroup",

    config_namespace: "ANDROID",

    bool_variables: [

        "move_crashrecovery_files",

        "crashrecovery_files_in_module",

    ],

    properties: [

        "srcs",
@@ -40,10 +39,9 @@ soong_config_module_type { 


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

        // if this flag is enabled, then files are part of module

        crashrecovery_files_in_module: {

            srcs: [

                "java/**/*.java",

                "java/**/*.aidl",

packages/CrashRecovery/services/Android.bp

+11 −13
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ soong_config_module_type { 
    module_type: "filegroup",

    config_namespace: "ANDROID",

    bool_variables: [

        "move_crashrecovery_files",

        "crashrecovery_files_in_platform",

    ],

    properties: [

        "srcs",
@@ -12,15 +12,14 @@ soong_config_module_type { 


platform_filegroup {

    name: "services-crashrecovery-sources",

    soong_config_variables: {

        // if this flag is enabled, then files are part of platform

        crashrecovery_files_in_platform: {

            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__"],
@@ -31,7 +30,7 @@ soong_config_module_type { 
    module_type: "filegroup",

    config_namespace: "ANDROID",

    bool_variables: [

        "move_crashrecovery_files",

        "crashrecovery_files_in_module",

    ],

    properties: [

        "srcs",
@@ -40,10 +39,9 @@ soong_config_module_type { 


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

        // if this flag is enabled, then files are part of module

        crashrecovery_files_in_module: {

            srcs: [

                "java/**/*.java",

                "java/**/*.aidl",