diff options
| author | Mathias Agopian <mathias@google.com> | 2017-05-10 17:36:14 -0700 |
|---|---|---|
| committer | Mathias Agopian <mathias@google.com> | 2017-05-10 17:36:14 -0700 |
| commit | 57ce1f9f2c37b8b6372ecb4f0857a52e42fb6d28 (patch) | |
| tree | b75e37943e32508f2e08d60fcca4628de7aa2695 | |
| parent | 597c2ff0dc3431ddd3bc552e3d3ddd76bcbd0f61 (diff) | |
| download | omx-components-57ce1f9f2c37b8b6372ecb4f0857a52e42fb6d28.tar.gz | |
fix circular dependency libnativewindow <-> libui
Bug: 37647680
Bug: 37648355
Test: compile, manual
Change-Id: I93c276f8d992e6ceb4ca53efc8a488a70bf6fe14
| -rwxr-xr-x | videocodec/Android.mk | 27 | ||||
| -rwxr-xr-x | videocodec/OMXVideoDecoderBase.cpp | 1 | ||||
| -rw-r--r-- | videocodec/OMXVideoDecoderVP9Hybrid.cpp | 1 |
3 files changed, 28 insertions, 1 deletions
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 @@ LOCAL_SHARED_LIBRARIES := \ 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 @@ LOCAL_SHARED_LIBRARIES := \ 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 @@ LOCAL_SHARED_LIBRARIES := \ 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 @@ LOCAL_SHARED_LIBRARIES := \ 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 @@ LOCAL_SHARED_LIBRARIES := \ 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 @@ LOCAL_SHARED_LIBRARIES := \ 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 @@ LOCAL_SHARED_LIBRARIES := \ 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 @@ LOCAL_SHARED_LIBRARIES := \ 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 @@ LOCAL_SHARED_LIBRARIES := \ libva \ libva-android +LOCAL_HEADER_LIBRARIES := \ + libnativebase_headers + LOCAL_C_INCLUDES := \ $(TARGET_OUT_HEADERS)/wrs_omxil_core \ $(TARGET_OUT_HEADERS)/khronos/openmax \ 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> diff --git a/videocodec/OMXVideoDecoderVP9Hybrid.cpp b/videocodec/OMXVideoDecoderVP9Hybrid.cpp index fe8d5f8..55934e0 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> |