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

Commit d784a48b authored by Edwin Wong's avatar Edwin Wong Committed by Automerger Merge Worker
Browse files

Merge "Build static and shared libdrmframeworkcommon." into rvc-qpr-dev am:... 

Merge "Build static and shared libdrmframeworkcommon." into rvc-qpr-dev am: 5e710fea am: 55fb1658

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/12703415

Change-Id: I529e04636d2c220825d2dda94cc5177613e2cd2d
parents 7aed66e7 55fb1658

drm/common/Android.bp

+6 −2
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
// limitations under the License.

//



cc_library_static {

cc_library {

    name: "libdrmframeworkcommon",



    srcs: [
@@ -35,7 +35,11 @@ cc_library_static { 


    cflags: ["-Wall", "-Werror"],



    shared_libs: ["libbinder"],

    shared_libs: [

        "libbinder",

        "liblog",

        "libutils"

    ],



    export_include_dirs: ["include"],

}

drm/drmserver/Android.bp

+1 −2
Original line number Diff line number Diff line
@@ -31,12 +31,11 @@ cc_binary { 
        "liblog",

        "libbinder",

        "libdl",

        "libdrmframeworkcommon",

        "libselinux",

        "libstagefright_foundation",

    ],



    static_libs: ["libdrmframeworkcommon"],



    cflags: [

        "-Wall",

        "-Wextra",

drm/libdrmframework/Android.bp

+2 −3
Original line number Diff line number Diff line
@@ -29,12 +29,11 @@ cc_library_shared { 
        "liblog",

        "libbinder",

        "libdl",

        "libdrmframeworkcommon",

    ],



    static_libs: ["libdrmframeworkcommon"],



    export_include_dirs: ["include"],

    export_static_lib_headers: ["libdrmframeworkcommon"],

    export_shared_lib_headers: ["libdrmframeworkcommon"],



    cflags: ["-Werror"],

}

drm/libdrmframework/plugins/forward-lock/FwdLockEngine/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -36,11 +36,11 @@ cc_library_shared { 
        "libcrypto",

        "libssl",

        "libdrmframework",

        "libdrmframeworkcommon",

    ],



    static_libs: [

        "libdrmutility",

        "libdrmframeworkcommon",

        "libfwdlock-common",

        "libfwdlock-converter",

        "libfwdlock-decoder",

drm/libdrmframework/plugins/passthru/Android.bp

+1 −2
Original line number Diff line number Diff line
@@ -19,12 +19,11 @@ cc_library_shared { 


    srcs: ["src/DrmPassthruPlugIn.cpp"],



    static_libs: ["libdrmframeworkcommon"],



    shared_libs: [

        "libutils",

        "liblog",

        "libdl",

        "libdrmframeworkcommon",

    ],



    local_include_dirs: ["include"],