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

Commit 1dce25b1 authored by Kelvin Zhang's avatar Kelvin Zhang Committed by Automerger Merge Worker
Browse files

Merge "Make libdebuggerd ramdisk available." into main am: dccb1e90 am:... 

Merge "Make libdebuggerd ramdisk available." into main am: dccb1e90 am: 8e6a2c8f am: 8c76a819 am: 2d7ce417

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2684517



Change-Id: I397614fe2de868c6de06905156a5a613d14868be
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9fc87279 2d7ce417

debuggerd/Android.bp

+14 −3
Original line number Diff line number Diff line
@@ -188,6 +188,7 @@ cc_library { 
cc_library_static {

    name: "libdebuggerd",

    defaults: ["debuggerd_defaults"],

    ramdisk_available: true,

    recovery_available: true,

    vendor_ramdisk_available: true,
@@ -221,9 +222,6 @@ cc_library_static { 
        "libbase",

        "libcutils",

    ],

    runtime_libs: [

        "libdexfile",           // libdexfile_support dependency

    ],



    whole_static_libs: [

        "libasync_safe",
@@ -250,6 +248,19 @@ cc_library_static { 
                "libdexfile",

            ],

        },

        ramdisk: {

            exclude_static_libs: [

                "libdexfile_support",

            ],

            exclude_runtime_libs: [

                "libdexfile",

            ],

        },

        android: {

            runtime_libs: [

                "libdexfile",           // libdexfile_support dependency

            ],

        },

    },



    product_variables: {

debuggerd/proto/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ cc_library_static { 
        "com.android.runtime",

    ],



    ramdisk_available: true,

    recovery_available: true,

    vendor_ramdisk_available: true,

}