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

Commit e31cfb60 authored by Martin Stjernholm's avatar Martin Stjernholm
Browse files

Use new static target for libdexfile_support. 

This is necessary since the dynamic one is now using dlopen(), which isn't
available in static builds.

Test: m
Test: mmma system/core/{libunwindstack,libbacktrace}, run host gtests (cannot get atest to work)
Bug: 123403798
Bug: 123186083
Change-Id: I06a9cdfe7e7cc01427ffd54b66c8ebab88782260
parent 1d7966bd

debuggerd/Android.bp

+4 −11
Original line number Diff line number Diff line
@@ -115,19 +115,14 @@ cc_library_static { 
        "libbase",

        "libdebuggerd",

        "libunwindstack",

        "libdexfile",  // libunwindstack dependency

        "libdexfile_external",  // libunwindstack dependency

        "libdexfile_support",  // libunwindstack dependency

        "libdexfile_support_static",  // libunwindstack dependency

        "liblzma",

        "libcutils",

    ],

    target: {

        recovery: {

            exclude_static_libs: [

                "libartbase",

                "libdexfile",

                "libdexfile_external",

                "libdexfile_support",

                "libdexfile_support_static",

            ],

        },

    },
@@ -174,8 +169,7 @@ cc_library_static { 
    include_dirs: ["bionic/libc"],



    static_libs: [

        "libdexfile_external",  // libunwindstack dependency

        "libdexfile_support",  // libunwindstack dependency

        "libdexfile_support_static",  // libunwindstack dependency

        "libunwindstack",

        "liblzma",

        "libbase",
@@ -185,8 +179,7 @@ cc_library_static { 
    target: {

        recovery: {

            exclude_static_libs: [

                "libdexfile_external",

                "libdexfile_support",

                "libdexfile_support_static",

            ],

        },

    },