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

Commit 9e5510d7 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix uprobestats deps for 32-bit targets" into main am: 649a67c0 am: 1e26a2d8 

Original change: https://android-review.googlesource.com/c/platform/build/+/3486213



Change-Id: I86f6f8fb255c788541286efc729a86e8ca09e105
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a793031d 1e26a2d8

target/product/generic/Android.bp

+6 −6
Original line number Original line Diff line number Diff line
@@ -702,6 +702,11 @@ android_filesystem_defaults { 
            "update_engine_client",

            "update_engine_client",

        ],

        ],

        default: [],

        default: [],

    }) + select(release_flag("RELEASE_UPROBESTATS_MODULE"), {

        true: [],

        default: [

            "uprobestats", // base_system internal

        ],

    }),

    }),

    multilib: {

    multilib: {

        common: {

        common: {
@@ -858,12 +863,7 @@ android_filesystem_defaults { 
                "android.system.virtualizationservice-ndk",

                "android.system.virtualizationservice-ndk",

                "libgsi",

                "libgsi",

                "servicemanager",

                "servicemanager",

            ] + select(release_flag("RELEASE_UPROBESTATS_MODULE"), {

                true: [],

                default: [

                    "uprobestats", // base_system internal

            ],

            ],

            }),

        },

        },

        both: {

        both: {

            deps: [

            deps: [