From c3ce3cb96eda9876d614d6dbb2664199ed1ac007 Mon Sep 17 00:00:00 2001
From: Ray Essick <essick@google.com>
Date: Tue, 12 Feb 2019 14:18:05 -0800
Subject: [PATCH] build mediaserver in 64 bit mode

mediaserver is no longer forced to 32-bit mode, floating to primary
architecture which is usually 64 bits.

Bug: 16890215
Test: boot, record video, android.media.cts.MediaPlayerTest
Change-Id: If5265e251a4201e7037ddaa2f36fa998936622aa
---
 media/libmediaplayerservice/Android.bp       | 2 --
 media/libmediaplayerservice/tests/Android.bp | 2 --
 media/mediaserver/Android.bp                 | 3 ---
 services/mediaresourcemanager/Android.bp     | 2 --
 4 files changed, 9 deletions(-)

diff --git a/media/libmediaplayerservice/Android.bp b/media/libmediaplayerservice/Android.bp
index 22fa495f91..46a1c24b73 100644
--- a/media/libmediaplayerservice/Android.bp
+++ b/media/libmediaplayerservice/Android.bp
@@ -64,8 +64,6 @@ cc_library_shared {
 
     name: "libmediaplayerservice",
 
-    compile_multilib: "32",
-
     sanitize: {
         cfi: true,
     },
diff --git a/media/libmediaplayerservice/tests/Android.bp b/media/libmediaplayerservice/tests/Android.bp
index 4749a8b9ec..f8c89e5fa5 100644
--- a/media/libmediaplayerservice/tests/Android.bp
+++ b/media/libmediaplayerservice/tests/Android.bp
@@ -14,8 +14,6 @@ cc_test {
         "android.hardware.drm@1.2",
     ],
 
-    compile_multilib: "32",
-
     cflags: [
         "-Werror",
         "-Wall",
diff --git a/media/mediaserver/Android.bp b/media/mediaserver/Android.bp
index 16c7be996e..f01947a841 100644
--- a/media/mediaserver/Android.bp
+++ b/media/mediaserver/Android.bp
@@ -21,7 +21,6 @@ cc_binary {
         "libutils",
         "libbinder",
         "libandroidicu",
-        "android.hardware.media.omx@1.0",
     ],
 
     static_libs: [
@@ -34,8 +33,6 @@ cc_binary {
         "frameworks/av/services/mediaresourcemanager",
     ],
 
-    compile_multilib: "32",
-
     init_rc: ["mediaserver.rc"],
 
     cflags: [
diff --git a/services/mediaresourcemanager/Android.bp b/services/mediaresourcemanager/Android.bp
index 1c63f64753..f3339a022a 100644
--- a/services/mediaresourcemanager/Android.bp
+++ b/services/mediaresourcemanager/Android.bp
@@ -16,8 +16,6 @@ cc_library_shared {
         "liblog",
     ],
 
-    compile_multilib: "32",
-
     include_dirs: ["frameworks/av/include"],
 
     cflags: [