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

Commit ed2b8f23 authored by Kris Alder's avatar Kris Alder Committed by Gerrit Code Review
Browse files

Merge "Fix vendor modules to use shared vndk"

parents bf76b844 77dbeeef
Loading
Loading
Loading
Loading
+4 −1
Original line number Original line Diff line number Diff line
@@ -23,8 +23,11 @@ cc_library_shared {


    srcs: ["C2SoftFlacEnc.cpp"],
    srcs: ["C2SoftFlacEnc.cpp"],


    static_libs: [
    shared_libs: [
        "libaudioutils",
        "libaudioutils",
    ],

    static_libs: [
        "libFLAC",
        "libFLAC",
    ],
    ],
}
}
+1 −1
Original line number Original line Diff line number Diff line
@@ -6,6 +6,7 @@ cc_library_shared {
    srcs: ["EffectDownmix.c"],
    srcs: ["EffectDownmix.c"],


    shared_libs: [
    shared_libs: [
        "libaudioutils",
        "libcutils",
        "libcutils",
        "liblog",
        "liblog",
    ],
    ],
@@ -23,5 +24,4 @@ cc_library_shared {
        "libaudioeffects",
        "libaudioeffects",
        "libhardware_headers",
        "libhardware_headers",
    ],
    ],
    static_libs: ["libaudioutils" ],
}
}
+3 −1
Original line number Original line Diff line number Diff line
@@ -15,8 +15,10 @@ cc_library_shared {
    },
    },


    header_libs: ["libbase_headers"],
    header_libs: ["libbase_headers"],
    static_libs: [
    shared_libs: [
        "libaudioutils",
        "libaudioutils",
    ],
    static_libs: [
        "libFLAC",
        "libFLAC",
    ],
    ],
}
}
+9 −18
Original line number Original line Diff line number Diff line
@@ -19,29 +19,20 @@ cc_library {
        cfi: true,
        cfi: true,
    },
    },


    static: {
    shared_libs: [
        whole_static_libs: [
            "libFLAC",
        "libaudioutils",
        "libaudioutils",
        "liblog",
    ],
    ],
    },


    shared: {
    static_libs: [
    static_libs: [
        "libFLAC",
        "libFLAC",
            "libaudioutils",
    ],
    ],

    export_static_lib_headers: [
    export_static_lib_headers: [
        "libFLAC",
        "libFLAC",
    ],
    ],
    },

    shared_libs: [
        "liblog",
    ],


    header_libs: [
    header_libs: [
        "libmedia_headers",
        "libmedia_headers",
        "libFLAC-headers",
    ],
    ],
}
}