From c6b2830e8105ff71619dba08275a16eb6ba70c07 Mon Sep 17 00:00:00 2001
From: Jeffrey Huang <jeffreyhuang@google.com>
Date: Wed, 15 Apr 2020 11:16:20 -0700
Subject: [PATCH] Add statsd device tests as mts target

Added multilib to cc_test as a workaround to the build system being
unable to separate 32 and 64bit architectures.

Bug: 153035538
Test: m -j
Change-Id: Ib7f3b01816d7cbd69b3dbf4dbf63ccb22b0c5b6a
---
 cmds/statsd/Android.bp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/cmds/statsd/Android.bp b/cmds/statsd/Android.bp
index 65061d0c9bdad..56c213b08d51f 100644
--- a/cmds/statsd/Android.bp
+++ b/cmds/statsd/Android.bp
@@ -290,7 +290,14 @@ cc_binary {
 cc_test {
     name: "statsd_test",
     defaults: ["statsd_defaults"],
-    test_suites: ["device-tests"],
+    test_suites: ["device-tests", "mts"],
+
+    //TODO(b/153588990): Remove when the build system properly separates 
+    //32bit and 64bit architectures.
+    multilib: {
+        lib32: { suffix: "32", },
+        lib64: { suffix: "64", },
+    },
 
     cflags: [
         "-Wall",