Merge "Fix atest statsd_test" into rvc-dev

2020-04-22 16:41:45 +00:00
parent e46216285b fe283e18d5
commit 8650e9aa11
1 changed files with 6 additions and 1 deletions
--- a/cmds/statsd/Android.bp
+++ b/cmds/statsd/Android.bp
@@ -295,7 +295,12 @@ cc_test {

    //TODO(b/153588990): Remove when the build system properly separates
    //32bit and 64bit architectures.
-    compile_multilib: "prefer32",
+    compile_multilib: "both",
+    multilib: {
+        lib64: {
+            suffix: "64",
+        }
+    },

    cflags: [
        "-Wall",