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/main_codecservice.cpp

diff --git a/services/mediacodec/main_codecservice.cpp b/services/mediacodec/main_codecservice.cpp
index ef305b4..38717b5 100644
--- a/services/mediacodec/main_codecservice.cpp
+++ b/services/mediacodec/main_codecservice.cpp
@@ -33,7 +33,7 @@
 
 #include <android/hardware/media/omx/1.0/IOmx.h>
 #include <hidl/HidlTransportSupport.h>
-#include <omx/hal/1.0/impl/Omx.h>
+#include <omx/1.0/Omx.h>
 
 using namespace android;