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

Commit 531adf7c authored by Ray Essick's avatar Ray Essick Committed by Android (Google) Code Review
Browse files

Merge "build mediaserver in 64 bit mode"

parents c07e5df3 c3ce3cb9

media/libmediaplayerservice/Android.bp

+0 −2
Original line number Original line Diff line number Diff line
@@ -64,8 +64,6 @@ cc_library_shared { 




    name: "libmediaplayerservice",

    name: "libmediaplayerservice",





    compile_multilib: "32",



    sanitize: {

    sanitize: {

        cfi: true,

        cfi: true,

    },

    },

media/libmediaplayerservice/tests/Android.bp

+0 −2
Original line number Original line Diff line number Diff line
@@ -14,8 +14,6 @@ cc_test { 
        "android.hardware.drm@1.2",

        "android.hardware.drm@1.2",

    ],

    ],





    compile_multilib: "32",



    cflags: [

    cflags: [

        "-Werror",

        "-Werror",

        "-Wall",

        "-Wall",

media/mediaserver/Android.bp

+0 −3
Original line number Original line Diff line number Diff line
@@ -21,7 +21,6 @@ cc_binary { 
        "libutils",

        "libutils",

        "libbinder",

        "libbinder",

        "libandroidicu",

        "libandroidicu",

        "android.hardware.media.omx@1.0",

    ],

    ],





    static_libs: [

    static_libs: [
@@ -34,8 +33,6 @@ cc_binary { 
        "frameworks/av/services/mediaresourcemanager",

        "frameworks/av/services/mediaresourcemanager",

    ],

    ],





    compile_multilib: "32",



    init_rc: ["mediaserver.rc"],

    init_rc: ["mediaserver.rc"],





    cflags: [

    cflags: [

services/mediaresourcemanager/Android.bp

+0 −2
Original line number Original line Diff line number Diff line
@@ -16,8 +16,6 @@ cc_library_shared { 
        "liblog",

        "liblog",

    ],

    ],





    compile_multilib: "32",



    include_dirs: ["frameworks/av/include"],

    include_dirs: ["frameworks/av/include"],





    cflags: [

    cflags: [