commit ca834f0790b6f71bc712728d4b37e3702e38190b
author Andrei Onea <andreionea@google.com> Tue May 24 17:31:23 2022 +0000
committer Andrei-Valentin Onea <andreionea@google.com> Fri May 27 15:13:07 2022 +0000
tree 940c7c6dd6a3188e074430a1b71cef8747ea1e80
parent c79b735d2d4e1a583a40e7a28281462ae4c58dfa

Fix ModulesUtilsTestingTests for 32 bit targets

Bundle both 32 and 64bit variants for libdexmakerjvmtiagent and
libstaticjvmtiagent when using it in CTS/MTS.

Test: atest ModulesUtilsTestingTests
Bug: 233566951
Ignore-AOSP-First: Needed to unblock train release. Will CP to AOSP after.
Change-Id: I36fb202facf27b4dcb220b541a79e3673d90df54

java/com/android/modules/utils/testing/Android.bp

diff --git a/java/com/android/modules/utils/testing/Android.bp b/java/com/android/modules/utils/testing/Android.bp
index d39bf3c..4fdb6fa 100644
--- a/java/com/android/modules/utils/testing/Android.bp
+++ b/java/com/android/modules/utils/testing/Android.bp
@@ -53,6 +53,7 @@
 java_defaults {
     name: "modules-utils-testable-device-config-defaults",
     static_libs: ["modules-utils-testable-device-config"],
+    compile_multilib: "both",
     jni_libs: [
         "libdexmakerjvmtiagent",
         "libstaticjvmtiagent",