commit 04563aafa0debc95d50951ca944abf37ef2777ce
author Pawin Vongmasa <pawin@google.com> Thu Mar 09 07:02:01 2017 -0800
committer Pawin Vongmasa <pawin@google.com> Tue Mar 14 17:13:37 2017 -0700
tree 27f23c70a302d8d8740b62c569a7d5ee48418aad
parent 0e4b8e9cb1b422195c49be49b48d039aa0814acf

Move hybrid interface from libbinder to libhidl/transport.

Also, merge android.hardware.media.omx@1.0-impl into libstagefright_omx.

Test: With CtsMediaTestCases.apk installed,
adb shell am instrument -e size small -w
'android.media.cts/android.support.test.runner.AndroidJUnitRunner'
Test: Manual use of Camera, Photos, Play Movies and YouTube apps.
Test: Manual use of screen mirroring.

Bug: 33854657
Change-Id: Ie927bcafd86dc7e9509bb8b76bb3b51f9a423cc7

services/mediacodec/Android.mk

diff --git a/services/mediacodec/Android.mk b/services/mediacodec/Android.mk
index 8814cf2..5cb7f92 100644
--- a/services/mediacodec/Android.mk
+++ b/services/mediacodec/Android.mk
@@ -34,8 +34,8 @@
     libcutils \
     libhwbinder \
     libhidltransport \
+    libstagefright_omx \
     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 \