Merge "Fix statsd_test mts build target" into rvc-dev am: 5aef02fd4a am: 79bc988ce8

Change-Id: I1b9ff0f31d479325ef95c86de23115a61dbbed87
2020-04-20 00:06:02 +00:00
parent 7f96c789af 79bc988ce8
commit 5700fafa94
1 changed files with 2 additions and 5 deletions
--- a/cmds/statsd/Android.bp
+++ b/cmds/statsd/Android.bp
@@ -293,12 +293,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",