commit c6743b43e07300e0caf5112f2f846a2b24b80aa2
author Tony Mak <tonymak@google.com> Thu May 25 08:32:13 2023 +0000
committer Tony Mak <tonymak@google.com> Fri May 26 09:45:28 2023 +0000
tree 6fa214ce988279847de58f00e8d7e2ad8fe0ae6b
parent 413dfe9597a0f4833d1c42a4990f30b3021e8c23

Set compile_multilib to be "both"

BUG: 274028926

Change-Id: I4b2815541704c618d9e732fc3f36d2f3529208fc

native/Android.bp

diff --git a/native/Android.bp b/native/Android.bp
index ae7f5c8..efea632 100644
--- a/native/Android.bp
+++ b/native/Android.bp
@@ -278,8 +278,15 @@
         "libtextclassifier_fbgen_utils_lua_utils_tests",
     ],
 
-    compile_multilib: "prefer32",
-
+    compile_multilib: "both",
+    multilib: {
+        lib32: {
+            suffix: "32",
+        },
+        lib64: {
+            suffix: "64",
+        },
+    },
     // A workaround for code coverage. See b/166040889#comment23
     sdk_variant_only: true,
 }

native/AndroidTest.xml

diff --git a/native/AndroidTest.xml b/native/AndroidTest.xml
index 11893f5..15ce73e 100644
--- a/native/AndroidTest.xml
+++ b/native/AndroidTest.xml
@@ -21,6 +21,11 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">
         <option name="cleanup" value="true" />
         <option name="push" value="libtextclassifier_tests->/data/local/tmp/libtextclassifier_tests" />
+        <option name="append-bitness" value="true" />
+    </target_preparer>
+
+    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">
+        <option name="cleanup" value="true" />
         <option name="push" value="actions->/data/local/tmp/actions" />
         <option name="push" value="annotator->/data/local/tmp/annotator" />
         <option name="push" value="utils->/data/local/tmp/utils" />