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

Change-Id: I62e9d2051ec11d67a9bb00f43db04cc905feba4e
2020-04-18 00:25:27 +00:00
parent c7bad138ec bb03100de8
commit 5face9affb
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",