ART Apex: prefer "first" to "prefer32" multilib option for tools am: 55a2349d7b

Original change: https://googleplex-android-review.googlesource.com/c/platform/art/+/15454154

Change-Id: I3eeede98bf6515c368c18ac2741198ca7bfa8b77

4 files changed, 16 insertions, 23 deletions

diff --git a/build/apex/Android.bp b/build/apex/Android.bp
index d5cf74c3b7..c5acc915d4 100644
--- a/build/apex/Android.bp
+++ b/build/apex/Android.bp
@@ -29,9 +29,9 @@ art_runtime_base_binaries_both = [
 art_runtime_base_binaries_both_on_device_first_on_host = [
     "dex2oat",
 ]
-// - Base requirements (binaries for which a 32-bit version is preferred on device, but for which
-//   only the "first" (likely 64-bit) version is required on host).
-art_runtime_base_binaries_prefer32_on_device_first_on_host = [
+// - Base requirements (binaries for which the "first" version is preferred on device
+//  (likely 64-bit) and on host).
+art_runtime_base_binaries_first_on_device_first_on_host = [
     "dexoptanalyzer",
     "odrefresh",
     "profman",
@@ -87,9 +87,9 @@ bionic_binaries_both = [
     "ziptool",
 ]
 
-// - Debug variants (binaries for which a 32-bit version is preferred on device, but for which
-//   only the "first" (likely 64-bit) version is required on host).
-art_runtime_debug_binaries_prefer32_on_device_first_on_host = [
+// - Debug variants (binaries for which the "first" version is preferred on device
+//  (likely 64-bit) and on host).
+art_runtime_debug_binaries_first_on_device_first_on_host = [
     "dexoptanalyzerd",
     "profmand",
 ]
@@ -249,11 +249,9 @@ apex_defaults {
             binaries: art_runtime_base_binaries_both +
                 art_runtime_base_binaries_both_on_device_first_on_host,
         },
-        prefer32: {
-            binaries: art_runtime_base_binaries_prefer32_on_device_first_on_host,
-        },
         first: {
-            binaries: art_tools_common_binaries +
+            binaries: art_runtime_base_binaries_first_on_device_first_on_host +
+                art_tools_common_binaries +
                 art_tools_device_only_binaries,
         },
     },
@@ -292,11 +290,9 @@ apex_defaults {
             binaries: art_tools_debug_binaries_both +
                 art_runtime_debug_binaries_both_on_device_first_on_host,
         },
-        prefer32: {
-            binaries: art_runtime_debug_binaries_prefer32_on_device_first_on_host,
-        },
         first: {
-            binaries: art_tools_debug_binaries +
+            binaries: art_runtime_debug_binaries_first_on_device_first_on_host +
+                art_tools_debug_binaries +
                 art_tools_debug_device_only_binaries,
         },
     },
@@ -395,9 +391,9 @@ art_apex_test_host {
                 art_tools_debug_binaries_both,
         },
         first: {
-            binaries: art_runtime_base_binaries_prefer32_on_device_first_on_host +
-                art_runtime_base_binaries_both_on_device_first_on_host +
-                art_runtime_debug_binaries_prefer32_on_device_first_on_host +
+            binaries: art_runtime_base_binaries_both_on_device_first_on_host +
+                art_runtime_base_binaries_first_on_device_first_on_host +
+                art_runtime_debug_binaries_first_on_device_first_on_host +
                 art_runtime_debug_binaries_both_on_device_first_on_host +
                 art_tools_common_binaries +
                 art_tools_debug_binaries + // Host APEX is always debug.
diff --git a/dexoptanalyzer/Android.bp b/dexoptanalyzer/Android.bp
index 8efaf28ddf..a66bd290fb 100644
--- a/dexoptanalyzer/Android.bp
+++ b/dexoptanalyzer/Android.bp
@@ -33,8 +33,7 @@ cc_defaults {
 
     target: {
         android: {
-            // Use the 32-bit version of dexoptanalyzer on devices.
-            compile_multilib: "prefer32",
+            compile_multilib: "first",
         },
     },
 
diff --git a/odrefresh/Android.bp b/odrefresh/Android.bp
index fae4231cbc..58c228bbda 100644
--- a/odrefresh/Android.bp
+++ b/odrefresh/Android.bp
@@ -50,8 +50,7 @@ cc_defaults {
     static_libs: ["libxml2"],
     target: {
         android: {
-            // Use the 32-bit version of odrefresh on devices.
-            compile_multilib: "prefer32",
+            compile_multilib: "first",
         },
         host: {
             shared_libs: [
diff --git a/profman/Android.bp b/profman/Android.bp
index 8cc3479205..917d79ab00 100644
--- a/profman/Android.bp
+++ b/profman/Android.bp
@@ -35,8 +35,7 @@ cc_defaults {
 
     target: {
         android: {
-            // Use the 32-bit version of profman on devices.
-            compile_multilib: "prefer32",
+            compile_multilib: "first",
             shared_libs: [
                 "libbase",
             ],