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

Commit bbb38231 authored by Jiabin Huang's avatar Jiabin Huang
Browse files

Revert "Revert "Move libmediahelper into a new folder."" 

This reverts commit a0877dc7.

Reason for revert: Should work with go/pag/1465463 merging to master.

Change-Id: I17217744eacabf15621d4a5aac9dd1678e37e4ba
parent a0877dc7

media/libaudiofoundation/Android.bp

+2 −4
Original line number Diff line number Diff line
@@ -4,13 +4,11 @@ cc_library_headers { 
    export_include_dirs: ["include"],

    header_libs: [

        "libaudio_system_headers",

        "libaudioclient_headers",

        "libmedia_headers",

        "libmedia_helper_headers",

    ],

    export_header_lib_headers: [

        "libaudio_system_headers",

        "libaudioclient_headers",

        "libmedia_headers",

        "libmedia_helper_headers",

    ],

}

media/libmedia/Android.bp

+0 −31
Original line number Diff line number Diff line
@@ -15,37 +15,6 @@ cc_library_headers { 
    ],

}



cc_library {

    name: "libmedia_helper",

    vendor_available: true,

    vndk: {

        enabled: true,

    },

    double_loadable: true,

    srcs: [

        "AudioParameter.cpp",

        "TypeConverter.cpp",

    ],

    cflags: [

        "-Werror",

        "-Wno-error=deprecated-declarations",

        "-Wall",

    ],

    shared_libs: [

        "libutils",

        "liblog",

    ],

    header_libs: [

        "libmedia_headers",

        "libaudioclient_headers",

        "libaudio_system_headers",

    ],

    export_header_lib_headers: [

        "libmedia_headers",

    ],

    clang: true,

}



filegroup {

    name: "libmedia_omx_aidl",

    srcs: [

media/libmediahelper/Android.bp

0 → 100644
+29 −0
Original line number Diff line number Diff line 
cc_library_headers {

    name: "libmedia_helper_headers",

    vendor_available: true,

    export_include_dirs: ["include"],

}



cc_library {

    name: "libmedia_helper",

    vendor_available: true,

    vndk: {

        enabled: true,

    },

    double_loadable: true,

    srcs: ["AudioParameter.cpp", "TypeConverter.cpp"],

    cflags: [

        "-Werror",

        "-Wextra",

        "-Wall",

    ],

    shared_libs: ["libutils", "liblog"],

    header_libs: [

        "libmedia_helper_headers",

        "libaudio_system_headers",

    ],

    export_header_lib_headers: [

        "libmedia_helper_headers",

    ],

    clang: true,

}