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

Commit 3d5e93c0 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [12820899, 12820921, 12820267, 12820924, 12820699,... 

Merge cherrypicks of [12820899, 12820921, 12820267, 12820924, 12820699, 12820781, 12821235, 12821236, 12820925, 12821237, 12820545, 12821039, 12820926, 12820927, 12820928, 12820929, 12820930, 12820590, 12820471, 12820591, 12820592, 12820593, 12820594, 12821255, 12821256, 12821257, 12820998, 12820932, 12821258, 12820546, 12820933, 12820934, 12820547, 12820548, 12821275, 12821238, 12821239, 12821240, 12821241, 12821199, 12821276, 12821277, 12821278, 12821279, 12821280] into rvc-qpr1-release

Change-Id: I0bd06da951ed53064e77cc6e348a293bd25dfdc7
parents 98aff38c f271aef4

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"],