commit 1a5e6c75d8bcdc71b55fbab21964c186ef8ec9a7
author Muhammad Qureshi <muhammadq@google.com> Tue Feb 18 11:30:17 2020 -0800
committer android-build-team Robot <android-build-team-robot@google.com> Wed Feb 19 18:41:46 2020 +0000
tree ea447a5509d0b20a6331461183aaa783e1c6d774
parent 56222b2157006aaa845524ddb31da1f89c3de6e8

Re-add compile_multilib to statsd apex

An earlier revert removed compile_multilib: both line which caused only
64-bit variant of libstats_jni to be added to the apex when 32-bit is
also required.

This change adds both 32-bit and 64-bit variants to the apex.

Bug: 149720256
Test: m
Test: fastboot flashall
Test: launch Play Store
Change-Id: I594b290e60052e28139cd954a54ada1067d43e09
(cherry picked from commit 6f83764ce50ef635a68daffbe705e27411dacab0)

apex/statsd/Android.bp

diff --git a/apex/statsd/Android.bp b/apex/statsd/Android.bp
index c8aa526..0e93110 100644
--- a/apex/statsd/Android.bp
+++ b/apex/statsd/Android.bp
@@ -27,6 +27,7 @@
         "framework-statsd",
         "service-statsd",
     ],
+    compile_multilib: "both",
     // prebuilts: ["my_prebuilt"],
     name: "com.android.os.statsd-defaults",
     key: "com.android.os.statsd.key",
@@ -72,4 +73,4 @@
         "com.android.os.statsd",
         "test_com.android.os.statsd",
     ],
-}
\ No newline at end of file
+}