Remove the dependency on passthrough IOmx in media.codec.
Also clean up some other dependencies.
Test: Manual testing with Camera, YouTube and Play Movies apps.
Bug: 35445903
Change-Id: I28562b5fbcc7054cf45c4ec2530bbe2ab4b5645f
diff --git a/services/mediacodec/Android.mk b/services/mediacodec/Android.mk
index a87c71c..a428c75 100644
--- a/services/mediacodec/Android.mk
+++ b/services/mediacodec/Android.mk
@@ -34,9 +34,12 @@
libcutils \
libhwbinder \
libhidltransport \
- android.hardware.media.omx@1.0
+ android.hardware.media.omx@1.0 \
+ android.hardware.media.omx@1.0-impl \
+ android.hidl.memory@1.0
LOCAL_C_INCLUDES := \
$(TOP)/frameworks/av/media/libstagefright \
+ $(TOP)/frameworks/av/media/libstagefright/include \
$(TOP)/frameworks/native/include/media/openmax
LOCAL_MODULE := mediacodec
LOCAL_32_BIT_ONLY := true