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

Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ia4e5e019093b17ef407864ea97d73b1f6e613e8c

1 files changed, 17 insertions, 0 deletions

diff --git a/libs/binder/tests/Android.bp b/libs/binder/tests/Android.bp
index bef9505821..3071408540 100644
--- a/libs/binder/tests/Android.bp
+++ b/libs/binder/tests/Android.bp
@@ -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: [