From a0f51ba4845194baa7b1ce4d15888acc2267501b Mon Sep 17 00:00:00 2001 From: Jae Shin Date: Mon, 30 Oct 2017 14:50:52 +0900 Subject: [PATCH] Remove libmedia_omx_defaults from libmedia libmedia_omx_defaults includes source files and this default was used in both libmedia.so and libmedia_omx.so. This is an issue because libmedia_omx and libmedia are both loaded in the framework process through dependency chains such as libstagefright -> libstagefright_omx_utils -> libmedia_omx. To fix the issue, libmedia_omx_defaults is removed from libmedia and libmedia now depends on libmedia_omx. Other modules/libs that originally depended on libmedia and need access to libmedia_omx_defaults' source files, now depend on libmedia_omx as well. Bug: 67871061 Test: mma -j and boot test Change-Id: I096d58d1e3338b70d5dae9d0f9919b908070d071 --- media/jni/Android.bp | 1 + 1 file changed, 1 insertion(+) diff --git a/media/jni/Android.bp b/media/jni/Android.bp index 1d85c97239ac6..597336bc5fae8 100644 --- a/media/jni/Android.bp +++ b/media/jni/Android.bp @@ -35,6 +35,7 @@ cc_library_shared { "libutils", "libbinder", "libmedia", + "libmedia_omx", "libmediametrics", "libmediadrm", "libmidi",