commit 3c9b0120e7ea330b2b638c2457fddd07d94a86ee
author Ray Essick <essick@google.com> Fri Mar 01 10:17:32 2019 -0800
committer Ray Essick <essick@google.com> Fri Mar 01 10:17:32 2019 -0800
tree 87d068a6da13a7f59225eaff844681b455ec3a4b
parent be32a246fc5623c049cf6417ced66dccc741653b

Mediaserver back to 32-bits

force mediaserver to 32-bits, 64-bit version failed wider testing.

Bug: 126502613
Bug: 16890215
Test: use camera app to record video
Test: android.media.cts.MediaPlayer2Test#testRecordedVideoPlayback0
Test: android.media.cts.MediaPlayerTest#testRecordedVideoPlayback0

media/mediaserver/Android.bp

diff --git a/media/mediaserver/Android.bp b/media/mediaserver/Android.bp
index f01947a..8377723 100644
--- a/media/mediaserver/Android.bp
+++ b/media/mediaserver/Android.bp
@@ -21,6 +21,7 @@
         "libutils",
         "libbinder",
         "libandroidicu",
+        "android.hardware.media.omx@1.0",
     ],
 
     static_libs: [
@@ -33,6 +34,9 @@
         "frameworks/av/services/mediaresourcemanager",
     ],
 
+    // back to 32-bit, b/126502613
+    compile_multilib: "32",
+
     init_rc: ["mediaserver.rc"],
 
     cflags: [