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

Commit 1b400288 authored by Alistair Delva's avatar Alistair Delva Committed by Automerger Merge Worker
Browse files

Merge "Build 64-bit mediaserver on 64-bit-only" am: b29806e2 am: 13de788c... 

Merge "Build 64-bit mediaserver on 64-bit-only" am: b29806e2 am: 13de788c am: 3257b365 am: 4b6e2d2f am: 0dbd7faa

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

Change-Id: I3b6fef50c104eeec9c2007a986cf78ab083536ee
parents 2fc9d15e 0dbd7faa

media/mediaserver/Android.bp

+4 −2
Original line number Diff line number Diff line
@@ -34,8 +34,10 @@ cc_binary { 
        "frameworks/av/services/mediaresourcemanager",

    ],



    // back to 32-bit, b/126502613

    compile_multilib: "32",

    // mediaserver has only been verified on 32-bit, see b/126502613

    // use "prefer32" to *only* enable 64-bit builds on 64-bit-only lunch

    // targets, which allows them to reach 'boot_complete'.

    compile_multilib: "prefer32",



    init_rc: ["mediaserver.rc"],

services/mediaresourcemanager/Android.bp

+1 −4
Original line number Diff line number Diff line 




cc_library_shared {

cc_library {

    name: "libresourcemanagerservice",



    srcs: [
@@ -25,5 +23,4 @@ cc_library_shared { 
    ],



    export_include_dirs: ["."],



}

services/mediaresourcemanager/test/Android.bp

+2 −4
Original line number Diff line number Diff line
@@ -3,12 +3,12 @@ cc_test { 
    name: "ResourceManagerService_test",

    srcs: ["ResourceManagerService_test.cpp"],

    test_suites: ["device-tests"],

    static_libs: ["libresourcemanagerservice"],

    shared_libs: [

        "libbinder",

        "libbinder_ndk",

        "liblog",

        "libmedia",

        "libresourcemanagerservice",

        "libutils",

    ],

    include_dirs: [
@@ -19,17 +19,16 @@ cc_test { 
        "-Werror",

        "-Wall",

    ],

    compile_multilib: "32",

}



cc_test {

    name: "ServiceLog_test",

    srcs: ["ServiceLog_test.cpp"],

    test_suites: ["device-tests"],

    static_libs: ["libresourcemanagerservice"],

    shared_libs: [

        "liblog",

        "libmedia",

        "libresourcemanagerservice",

        "libutils",

    ],

    include_dirs: [
@@ -40,5 +39,4 @@ cc_test { 
        "-Werror",

        "-Wall",

    ],

    compile_multilib: "32",

}