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

Commit 00f480e0 authored by Jihoon Kang's avatar Jihoon Kang
Browse files

Do not split struct properties based on soong_config_variables 

https://r.android.com/3009280 has introduced the mechanism to modify the
tag of the dist artifacts based on the soong_config_variable (i.e. based
on the value of the build flag "RELEASE_HIDDEN_API_EXPORTABLE_STUBS" or
the product variable "PRODUCT_HIDDEN_API_EXPORTABLE_STUBS"). In order to
minimize duplication, the change has kept the common properties within
the struct outside of the "soong_config_variables" block and only
specified the affected (list of) struct properties (tag) in the
"soong_config_variables" block.

However, this is an unsupported feature in Soong and led to the default
OutputFile (i.e. the output file when no tag is specified). In order to
fix this, this change specifies all properties of the struct in the
"soong_config_variables" block, with the cost of some duplication.

Test: ABTD
Bug: 333653043
Change-Id: If91099b3499894d5b1c284ace0e1f23c80b84051
parent 22be9ae7

api/StubLibraries.bp

+60 −58
Original line number Diff line number Diff line
@@ -54,34 +54,34 @@ non_updatable_exportable_droidstubs { 
            baseline_file: ":non-updatable-lint-baseline.txt",

        },

    },

    soong_config_variables: {

        release_hidden_api_exportable_stubs: {

            dists: [

                {

                    targets: ["sdk"],

                    dir: "apistubs/android/public/api",

                    dest: "android-non-updatable.txt",

                    tag: ".exportable.api.txt",

                },

                {

                    targets: ["sdk"],

                    dir: "apistubs/android/public/api",

                    dest: "android-non-updatable-removed.txt",

        },

    ],

    soong_config_variables: {

        release_hidden_api_exportable_stubs: {

            dists: [

                {

                    tag: ".exportable.api.txt",

                },

                {

                    tag: ".exportable.removed-api.txt",

                },

            ],

            conditions_default: {

                dists: [

                    {

                        targets: ["sdk"],

                        dir: "apistubs/android/public/api",

                        dest: "android-non-updatable.txt",

                        tag: ".api.txt",

                    },

                    {

                        targets: ["sdk"],

                        dir: "apistubs/android/public/api",

                        dest: "android-non-updatable-removed.txt",

                        tag: ".removed-api.txt",

                    },

                ],
@@ -134,34 +134,34 @@ non_updatable_exportable_droidstubs { 
            baseline_file: ":non-updatable-system-lint-baseline.txt",

        },

    },

    soong_config_variables: {

        release_hidden_api_exportable_stubs: {

            dists: [

                {

                    targets: ["sdk"],

                    dir: "apistubs/android/system/api",

                    dest: "android-non-updatable.txt",

                    tag: ".exportable.api.txt",

                },

                {

                    targets: ["sdk"],

                    dir: "apistubs/android/system/api",

                    dest: "android-non-updatable-removed.txt",

        },

    ],

    soong_config_variables: {

        release_hidden_api_exportable_stubs: {

            dists: [

                {

                    tag: ".exportable.api.txt",

                },

                {

                    tag: ".exportable.removed-api.txt",

                },

            ],

            conditions_default: {

                dists: [

                    {

                        targets: ["sdk"],

                        dir: "apistubs/android/system/api",

                        dest: "android-non-updatable.txt",

                        tag: ".api.txt",

                    },

                    {

                        targets: ["sdk"],

                        dir: "apistubs/android/system/api",

                        dest: "android-non-updatable-removed.txt",

                        tag: ".removed-api.txt",

                    },

                ],
@@ -189,56 +189,58 @@ non_updatable_exportable_droidstubs { 
            baseline_file: ":non-updatable-test-lint-baseline.txt",

        },

    },

    soong_config_variables: {

        release_hidden_api_exportable_stubs: {

            dists: [

                {

                    targets: ["sdk"],

                    dir: "apistubs/android/test/api",

                    dest: "android.txt",

                    tag: ".exportable.api.txt",

                },

                {

                    targets: ["sdk"],

                    dir: "apistubs/android/test/api",

                    dest: "removed.txt",

                    tag: ".exportable.removed-api.txt",

                },

                {

                    targets: ["sdk"],

                    dir: "apistubs/android/test/api",

                    dest: "android-non-updatable.txt",

                    tag: ".exportable.api.txt",

                },

                {

                    targets: ["sdk"],

                    dir: "apistubs/android/test/api",

                    dest: "android-non-updatable-removed.txt",

        },

    ],

    soong_config_variables: {

        release_hidden_api_exportable_stubs: {

            dists: [

                {

                    tag: ".exportable.api.txt",

                },

                {

                    tag: ".exportable.removed-api.txt",

                },

                {

                    tag: ".exportable.api.txt",

                },

                {

                    tag: ".exportable.removed-api.txt",

                },

            ],

            conditions_default: {

                dists: [

                    {

                        targets: ["sdk"],

                        dir: "apistubs/android/test/api",

                        dest: "android.txt",

                        tag: ".api.txt",

                    },

                    {

                        targets: ["sdk"],

                        dir: "apistubs/android/test/api",

                        dest: "removed.txt",

                        tag: ".removed-api.txt",

                    },

                    {

                        targets: ["sdk"],

                        dir: "apistubs/android/test/api",

                        dest: "android-non-updatable.txt",

                        tag: ".api.txt",

                    },

                    {

                        targets: ["sdk"],

                        dir: "apistubs/android/test/api",

                        dest: "android-non-updatable-removed.txt",

                        tag: ".removed-api.txt",

                    },

                ],
@@ -271,34 +273,34 @@ non_updatable_exportable_droidstubs { 
            baseline_file: ":non-updatable-module-lib-lint-baseline.txt",

        },

    },

    soong_config_variables: {

        release_hidden_api_exportable_stubs: {

            dists: [

                {

                    targets: ["sdk"],

                    dir: "apistubs/android/module-lib/api",

                    dest: "android-non-updatable.txt",

                    tag: ".exportable.api.txt",

                },

                {

                    targets: ["sdk"],

                    dir: "apistubs/android/module-lib/api",

                    dest: "android-non-updatable-removed.txt",

        },

    ],

    soong_config_variables: {

        release_hidden_api_exportable_stubs: {

            dists: [

                {

                    tag: ".exportable.api.txt",

                },

                {

                    tag: ".exportable.removed-api.txt",

                },

            ],

            conditions_default: {

                dists: [

                    {

                        targets: ["sdk"],

                        dir: "apistubs/android/module-lib/api",

                        dest: "android-non-updatable.txt",

                        tag: ".api.txt",

                    },

                    {

                        targets: ["sdk"],

                        dir: "apistubs/android/module-lib/api",

                        dest: "android-non-updatable-removed.txt",

                        tag: ".removed-api.txt",

                    },

                ],

services/Android.bp

+12 −12
Original line number Diff line number Diff line
@@ -285,34 +285,34 @@ non_updatable_exportable_droidstubs { 
            baseline_file: "api/lint-baseline.txt",

        },

    },

    soong_config_variables: {

        release_hidden_api_exportable_stubs: {

            dists: [

                {

                    targets: ["sdk"],

                    dir: "apistubs/android/system-server/api",

                    dest: "android-non-updatable.txt",

                    tag: ".exportable.api.txt",

                },

                {

                    targets: ["sdk"],

                    dir: "apistubs/android/system-server/api",

                    dest: "android-non-updatable-removed.txt",

        },

    ],

    soong_config_variables: {

        release_hidden_api_exportable_stubs: {

            dists: [

                {

                    tag: ".exportable.api.txt",

                },

                {

                    tag: ".exportable.removed-api.txt",

                },

            ],

            conditions_default: {

                dists: [

                    {

                        targets: ["sdk"],

                        dir: "apistubs/android/system-server/api",

                        dest: "android-non-updatable.txt",

                        tag: ".api.txt",

                    },

                    {

                        targets: ["sdk"],

                        dir: "apistubs/android/system-server/api",

                        dest: "android-non-updatable-removed.txt",

                        tag: ".removed-api.txt",

                    },

                ],