From 9c30a95f5a3320729228a91f72c649b759cae4f7 Mon Sep 17 00:00:00 2001
From: Jeffrey Huang <jeffreyhuang@google.com>
Date: Fri, 17 Apr 2020 15:33:32 -0700
Subject: [PATCH] Fix statsd_test mts build target

The test tried to execute statsd_test when the binary was named
statsd_test32. This fixes the naming issue.

Bug: 153035538
Test: make mts and check the binary name
Change-Id: I13485a95801f9ef71211cd1d36e8ea1fd3bbc0b6
---
 cmds/statsd/Android.bp | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/cmds/statsd/Android.bp b/cmds/statsd/Android.bp
index 56c213b08d51f..7712841592239 100644
--- a/cmds/statsd/Android.bp
+++ b/cmds/statsd/Android.bp
@@ -292,12 +292,9 @@ cc_test {
     defaults: ["statsd_defaults"],
     test_suites: ["device-tests", "mts"],
 
-    //TODO(b/153588990): Remove when the build system properly separates 
+    //TODO(b/153588990): Remove when the build system properly separates
     //32bit and 64bit architectures.
-    multilib: {
-        lib32: { suffix: "32", },
-        lib64: { suffix: "64", },
-    },
+    compile_multilib: "prefer32",
 
     cflags: [
         "-Wall",