commit 78abbca377701d4e705ad5347052b521bdb972ff
author Christopher Ferris <cferris@google.com> Thu Aug 03 22:15:53 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Aug 03 22:15:53 2017 +0000
tree dcf179bb62b8e61398def19ec85d10b89949c09f
parent 901d56d838ab00a99d3e9c001fb16f722ba5f334
parent 6b7e73e86c7a09b638bab9e60b1e11e869e62461

Use frozen copy of ion.h for this code. am: 34bb282eb4
am: 6b7e73e86c

Change-Id: I0585d4bce775463f0b3207486acf1d72fa83609b

videocodec/Android.mk

diff --git a/videocodec/Android.mk b/videocodec/Android.mk
index 3dfab7e..438a238 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 \
@@ -157,6 +163,9 @@
     libva_videodecoder \
     libdl \
 
+LOCAL_HEADER_LIBRARIES := \
+    libnativebase_headers
+
 LOCAL_C_INCLUDES := \
     $(TARGET_OUT_HEADERS)/wrs_omxil_core \
     $(TARGET_OUT_HEADERS)/khronos/openmax \
@@ -215,6 +224,9 @@
     libva \
     libva-android
 
+LOCAL_HEADER_LIBRARIES := \
+    libnativebase_headers
+
 LOCAL_C_INCLUDES := \
     $(TARGET_OUT_HEADERS)/wrs_omxil_core \
     $(TARGET_OUT_HEADERS)/khronos/openmax \
@@ -276,6 +288,9 @@
     libva \
     libva-android
 
+LOCAL_HEADER_LIBRARIES := \
+    libnativebase_headers
+
 LOCAL_C_INCLUDES := \
     $(TARGET_OUT_HEADERS)/wrs_omxil_core \
     $(TARGET_OUT_HEADERS)/khronos/openmax \
@@ -337,6 +352,9 @@
     libva \
     libva-android
 
+LOCAL_HEADER_LIBRARIES := \
+    libnativebase_headers
+
 LOCAL_C_INCLUDES := \
     $(TARGET_OUT_HEADERS)/wrs_omxil_core \
     $(TARGET_OUT_HEADERS)/khronos/openmax \
@@ -406,6 +424,9 @@
     libva-android \
     libcutils
 
+LOCAL_HEADER_LIBRARIES := \
+    libnativebase_headers
+
 LOCAL_C_INCLUDES := \
     $(TARGET_OUT_HEADERS)/wrs_omxil_core \
     $(TARGET_OUT_HEADERS)/khronos/openmax \
@@ -461,6 +482,9 @@
     libva \
     libva-android
 
+LOCAL_HEADER_LIBRARIES := \
+    libnativebase_headers
+
 LOCAL_C_INCLUDES := \
     $(TARGET_OUT_HEADERS)/wrs_omxil_core \
     $(TARGET_OUT_HEADERS)/khronos/openmax \
@@ -625,6 +649,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>