summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeffrey Huang <jeffreyhuang@google.com>2020-04-22 17:27:36 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-04-22 17:27:36 +0000
commit14f6d79cfa65a29996a1652677aee556b51a8d75 (patch)
tree930c10d4f678975e15c694f23bd6735db2414c4f
parent5ffeaf3af8453208617d01ee13aff20409886594 (diff)
parentd108f1093b4bd0bb0a6486d848cdc2811956be58 (diff)
Merge "Fix atest statsd_test" into rvc-dev am: 8650e9aa11 am: 6e80428408 am: d108f1093b
Change-Id: If72f424e7d08a8a999f79257852d6702cc1d05e1
-rw-r--r--cmds/statsd/Android.bp7
1 files changed, 6 insertions, 1 deletions
diff --git a/cmds/statsd/Android.bp b/cmds/statsd/Android.bp
index 0e49d187a3b5..f30ed17c392f 100644
--- 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",