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

Commit 4345046d authored by Lajos Molnar's avatar Lajos Molnar
Browse files

Codec2: codec2_vndk is now a shared lib, plus, add internal headers 

Bug: 64121714
Change-Id: Iccc0bc3cf01d8258d156a586868f059a8ec4ea4e
parent 5dca0174

media/libstagefright/Android.bp

+1 −2
Original line number Diff line number Diff line
@@ -126,6 +126,7 @@ cc_library_shared { 
        "libutils",

        "libmedia_helper",

        "libstagefright_codec2",

        "libstagefright_codec2_vndk",

        "libstagefright_foundation",

        "libstagefright_gbs",

        "libstagefright_omx",
@@ -154,8 +155,6 @@ cc_library_shared { 
        "libstagefright_esds",

        "libstagefright_id3",

        "libFLAC",



        "libstagefright_codec2_vndk",

    ],



    export_shared_lib_headers: [

media/libstagefright/codec2/vndk/Android.bp

+15 −1
Original line number Diff line number Diff line 
cc_library {

cc_library_headers {

    name: "libstagefright_codec2_internal",



    export_include_dirs: [

        "internal",

    ],



    vendor_available: false,

}



cc_library_shared {

    name: "libstagefright_codec2_vndk",



    srcs: [
@@ -13,6 +23,10 @@ cc_library { 
        "include",

    ],



    header_libs:[

        "libstagefright_codec2_internal",

    ],



    include_dirs: [

        "frameworks/av/media/libstagefright/codec2/include",

        "frameworks/native/include/media/hardware",

media/libstagefright/codec2/vndk/C2ParamInternal.h→media/libstagefright/codec2/vndk/internal/C2ParamInternal.h

+5 −1
Original line number Diff line number Diff line
@@ -34,6 +34,10 @@ struct C2_HIDE _C2ParamInspector { 
        return pf._mFieldId._mSize;

    }



    inline static uint32_t getAttrib(const C2ParamDescriptor &pd) {

        return pd._mAttrib;

    }



    inline static

    C2ParamField CreateParamField(C2Param::Index index, uint32_t offset, uint32_t size) {

        return C2ParamField(index, offset, size);

media/libstagefright/codecs/aacdec/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ cc_library_shared { 


    static_libs: [

        "libFraunhoferAAC",

        "libstagefright_codec2_vndk"

    ],



    shared_libs: [
@@ -33,6 +32,7 @@ cc_library_shared { 
        "libion",

        "liblog",

        "libstagefright_codec2",

        "libstagefright_codec2_vndk",

        "libstagefright_foundation",

        "libstagefright_simple_c2component",

        "libutils",

media/libstagefright/codecs/aacenc/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ cc_library_shared { 


    static_libs: [

        "libFraunhoferAAC",

        "libstagefright_codec2_vndk"

    ],



    shared_libs: [
@@ -30,6 +29,7 @@ cc_library_shared { 
        "libion",

        "liblog",

        "libstagefright_codec2",

        "libstagefright_codec2_vndk",

        "libstagefright_foundation",

        "libstagefright_simple_c2component",

        "libutils",