summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jeffrey Huang <jeffreyhuang@google.com> 2020-04-22 16:41:45 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2020-04-22 16:41:45 +0000
commit8650e9aa11e3ad5c72b11e651170060d9fa19cde (patch)
tree9fe7db114188defb41e09e6a6f4d15ea5678cc14
parente46216285b88a4f18dd2c4497f45a04061786e75 (diff)
parentfe283e18d57395bf7f84e99c3cd3f1aa114a7da7 (diff)
Merge "Fix atest statsd_test" into rvc-dev
-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",