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: [