commit af1c44490ec70a4ddd7c99c09731c8e76a2ae07a
author Steven Moreland <smoreland@google.com> Wed Sep 02 22:15:27 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Sep 02 22:15:27 2020 +0000
tree e4f60399b96bf01e2b7f31594adc1139112f9aec
parent c30d6252e32890b765720231c113ebf5cc419d67
parent 97c0da9fcd32b1a9ad5d82bdae39c429edbce3a5

Merge "msgq test service: installable by atest" am: f74120b1fb am: b793e77b3d am: 2bd24fb45f am: 97c0da9fcd

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1313073

Change-Id: I5c962bbe56fc77a58966df1709dcb84ed183e893

tests/msgq/1.0/default/Android.bp

diff --git a/tests/msgq/1.0/default/Android.bp b/tests/msgq/1.0/default/Android.bp
index 47b8df1..a5ba23d 100644
--- a/tests/msgq/1.0/default/Android.bp
+++ b/tests/msgq/1.0/default/Android.bp
@@ -70,6 +70,17 @@
         "libbinder_ndk",
     ],
 
+    compile_multilib: "both",
+    multilib: {
+        lib32: {
+            suffix: "32",
+        },
+        lib64: {
+            suffix: "64",
+        },
+    },
+    test_suites: ["device-tests"],
+
     // Allow dlsym'ing self for statically linked passthrough implementations
     ldflags: ["-rdynamic"],
 
@@ -84,5 +95,4 @@
         "android.hardware.tests.msgq@1.0-impl",
         "android.fmq.test-impl",
     ],
-    test_suites: ["general-tests"],
 }