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

Commit e6ab1172 authored by Martin Stjernholm's avatar Martin Stjernholm Committed by android-build-merger
Browse files

Merge "Fix libdexfile dependencies to avoid direct dependency on libdexfile_external." 

am: 21c29cfa

Change-Id: I1526f70910aa0ecd49d303bc848a3d08e4aa7a76
parents ab0319ec 21c29cfa

debuggerd/Android.bp

+1 −3
Original line number Diff line number Diff line
@@ -218,13 +218,11 @@ cc_test { 
        "liblog",

        "libminijail",

        "libnativehelper",

        "libunwindstack",

    ],



    static_libs: [

        "libdebuggerd",

        "libdexfile_external",  // libunwindstack dependency

        "libdexfile_support",  // libunwindstack dependency

        "libunwindstack",

    ],



    local_include_dirs: [

libunwindstack/Android.bp

+0 −3
Original line number Diff line number Diff line
@@ -95,7 +95,6 @@ cc_library { 
                "DexFiles.cpp",

            ],

            exclude_shared_libs: [

                "libdexfile_external",

                "libdexfile_support",

            ],

        },
@@ -106,7 +105,6 @@ cc_library { 
                "DexFiles.cpp",

            ],

            exclude_shared_libs: [

                "libdexfile_external",

                "libdexfile_support",

            ],

        },
@@ -137,7 +135,6 @@ cc_library { 


    shared_libs: [

        "libbase",

        "libdexfile_external",

        "libdexfile_support",

        "liblog",

        "liblzma",