commit 1ab0b88dd176855fde022b2e27d1a539434f599f
author Alistair Delva <adelva@google.com> Tue Jun 09 11:47:23 2020 -0700
committer Alistair Delva <adelva@google.com> Mon Jul 06 09:53:03 2020 -0700
tree 7d03d5928be56baa5215527aa0fe565bd6cf1b1f
parent a4d629d3112cb6d27222eff7a24fc47f39da9539

Build 64-bit mediaserver on 64-bit-only

This change also updates the mediaresourcemanager tests to be buildable
on both 32-bit and 64-bit, without adding additional libraries to the
system image.

Bug: 16890215
Change-Id: Icf8f1d0b098217d34bf27911a72346124588cc5b

media/mediaserver/Android.bp

diff --git a/media/mediaserver/Android.bp b/media/mediaserver/Android.bp
index a968890..56b59e2 100644
--- a/media/mediaserver/Android.bp
+++ b/media/mediaserver/Android.bp
@@ -33,8 +33,10 @@
         "frameworks/av/services/mediaresourcemanager",
     ],
 
-    // back to 32-bit, b/126502613
-    compile_multilib: "32",
+    // mediaserver has only been verified on 32-bit, see b/126502613
+    // use "prefer32" to *only* enable 64-bit builds on 64-bit-only lunch
+    // targets, which allows them to reach 'boot_complete'.
+    compile_multilib: "prefer32",
 
     init_rc: ["mediaserver.rc"],