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

Commit 71f6de41 authored by Hsin-Yi Chen's avatar Hsin-Yi Chen
Browse files

resolve merge conflicts of 6c8cab11 to stage-aosp-master 

Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ia4e5e019093b17ef407864ea97d73b1f6e613e8c
parents 78bd7eb0 6c8cab11

libs/binder/tests/Android.bp

+17 −0
Original line number Diff line number Diff line
@@ -42,6 +42,23 @@ cc_test { 
}



cc_test {

    name: "binderLibTest_IPC_32",

    srcs: ["binderLibTest.cpp"],

    shared_libs: [

        "libbinder",

        "libutils",

    ],

    compile_multilib: "32",

    cflags: ["-DBINDER_IPC_32BIT=1"],

}



cc_test {

    product_variables: {

        binder32bit: {

            cflags: ["-DBINDER_IPC_32BIT=1"],

        },

    },



    name: "binderLibTest",

    srcs: ["binderLibTest.cpp"],

    shared_libs: [