commit 99f3d7ce6e7ac52d614ff925fbee0bfdf437d536
author Austin Hu <austin.hu@intel.com> Fri Jun 30 17:13:37 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jun 30 17:13:37 2017 +0000
tree d708778972d5a818a0b7ddfe76e21bb21918dec4
parent 34736e8ba7b6d3d98e8b7d5d23d0d918df1b0a0a
parent ece7d9646dae34594f912fce2e0f1b274bf4daf3

Fixed the issue that the fd of native_handle_t wasn't closed.
am: ece7d9646d

Change-Id: I0ba0fc65b8e35e1a4baacf1e470e6627d0a7e39b

videocodec/Android.mk

diff --git a/videocodec/Android.mk b/videocodec/Android.mk
index 4917dd8..da659a9 100755
--- a/videocodec/Android.mk
+++ b/videocodec/Android.mk
@@ -20,6 +20,9 @@
     libva \
     libva-android
 
+LOCAL_HEADER_LIBRARIES := \
+    libnativebase_headers
+
 LOCAL_C_INCLUDES := \
     $(TARGET_OUT_HEADERS)/wrs_omxil_core \
     $(TARGET_OUT_HEADERS)/khronos/openmax \
@@ -94,6 +97,9 @@
     libva \
     libva-android
 
+LOCAL_HEADER_LIBRARIES := \
+    libnativebase_headers
+
 LOCAL_C_INCLUDES := \
     $(TARGET_OUT_HEADERS)/wrs_omxil_core \
     $(TARGET_OUT_HEADERS)/khronos/openmax \
@@ -156,6 +162,9 @@
     libva_videodecoder \
     libdl \
 
+LOCAL_HEADER_LIBRARIES := \
+    libnativebase_headers
+
 LOCAL_C_INCLUDES := \
     $(TARGET_OUT_HEADERS)/wrs_omxil_core \
     $(TARGET_OUT_HEADERS)/khronos/openmax \
@@ -214,6 +223,9 @@
     libva \
     libva-android
 
+LOCAL_HEADER_LIBRARIES := \
+    libnativebase_headers
+
 LOCAL_C_INCLUDES := \
     $(TARGET_OUT_HEADERS)/wrs_omxil_core \
     $(TARGET_OUT_HEADERS)/khronos/openmax \
@@ -275,6 +287,9 @@
     libva \
     libva-android
 
+LOCAL_HEADER_LIBRARIES := \
+    libnativebase_headers
+
 LOCAL_C_INCLUDES := \
     $(TARGET_OUT_HEADERS)/wrs_omxil_core \
     $(TARGET_OUT_HEADERS)/khronos/openmax \
@@ -336,6 +351,9 @@
     libva \
     libva-android
 
+LOCAL_HEADER_LIBRARIES := \
+    libnativebase_headers
+
 LOCAL_C_INCLUDES := \
     $(TARGET_OUT_HEADERS)/wrs_omxil_core \
     $(TARGET_OUT_HEADERS)/khronos/openmax \
@@ -405,6 +423,9 @@
     libva-android \
     libcutils
 
+LOCAL_HEADER_LIBRARIES := \
+    libnativebase_headers
+
 LOCAL_C_INCLUDES := \
     $(TARGET_OUT_HEADERS)/wrs_omxil_core \
     $(TARGET_OUT_HEADERS)/khronos/openmax \
@@ -460,6 +481,9 @@
     libva \
     libva-android
 
+LOCAL_HEADER_LIBRARIES := \
+    libnativebase_headers
+
 LOCAL_C_INCLUDES := \
     $(TARGET_OUT_HEADERS)/wrs_omxil_core \
     $(TARGET_OUT_HEADERS)/khronos/openmax \
@@ -624,6 +648,9 @@
     libva \
     libva-android
 
+LOCAL_HEADER_LIBRARIES := \
+    libnativebase_headers
+
 LOCAL_C_INCLUDES := \
     $(TARGET_OUT_HEADERS)/wrs_omxil_core \
     $(TARGET_OUT_HEADERS)/khronos/openmax \

videocodec/OMXVideoDecoderBase.cpp

diff --git a/videocodec/OMXVideoDecoderBase.cpp b/videocodec/OMXVideoDecoderBase.cpp
index 54fcfdc..9ea1955 100755
--- a/videocodec/OMXVideoDecoderBase.cpp
+++ b/videocodec/OMXVideoDecoderBase.cpp
@@ -18,6 +18,7 @@
 #define LOG_TAG "OMXVideoDecoder"
 #include <wrs_omxil_core/log.h>
 
+#include <nativebase/nativebase.h>
 #include <hardware/gralloc.h>
 #include <va/va_android.h>
 

videocodec/OMXVideoDecoderVP9Hybrid.cpp

diff --git a/videocodec/OMXVideoDecoderVP9Hybrid.cpp b/videocodec/OMXVideoDecoderVP9Hybrid.cpp
index d6030e4..61d7ba2 100644
--- a/videocodec/OMXVideoDecoderVP9Hybrid.cpp
+++ b/videocodec/OMXVideoDecoderVP9Hybrid.cpp
@@ -20,7 +20,6 @@
 #include <wrs_omxil_core/log.h>
 #include "OMXVideoDecoderVP9Hybrid.h"
 
-#include <system/window.h>
 #include <hardware/hardware.h>
 #include <hardware/gralloc.h>
 #include <system/graphics.h>