From cbd082d46d59f40c72d3de8c971672bd8e395eb6 Mon Sep 17 00:00:00 2001
From: David Anderson <dvander@google.com>
Date: Tue, 6 Dec 2022 20:11:40 -0800
Subject: [PATCH] Disable multilib for CtsInitTestCases.

Bug: 260393485
Test: run cts -m CtsInitTestCases
Change-Id: I92a11b7961411b22525d4434312479878b353b55
---
 init/Android.bp      | 10 +---------
 init/AndroidTest.xml |  1 -
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/init/Android.bp b/init/Android.bp
index c7e7de850..1aba4b381 100644
--- a/init/Android.bp
+++ b/init/Android.bp
@@ -454,15 +454,7 @@ cc_test {
     defaults: ["init_defaults"],
     require_root: true,
 
-    compile_multilib: "both",
-    multilib: {
-        lib32: {
-            suffix: "32",
-        },
-        lib64: {
-            suffix: "64",
-        },
-    },
+    compile_multilib: "first",
 
     srcs: [
         "devices_test.cpp",
diff --git a/init/AndroidTest.xml b/init/AndroidTest.xml
index 6f22ab792..8b05484a0 100644
--- a/init/AndroidTest.xml
+++ b/init/AndroidTest.xml
@@ -22,7 +22,6 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">
         <option name="cleanup" value="true" />
         <option name="push" value="CtsInitTestCases->/data/local/tmp/CtsInitTestCases" />
-        <option name="append-bitness" value="true" />
     </target_preparer>
     <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer">
         <option name="throw-on-error" value="false" />