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

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

Merge "Use new static target for libdexfile_support." am: 612a6d6b

am: 12a4cef6

Change-Id: I7ae56a2d86b5f8d4c8258ce6a2b4131610a38eca
parents b4e53daa 12a4cef6
Loading
Loading
Loading
Loading
+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",
            ],
        },
    },