diff options
| author | Mathias Agopian <mathias@google.com> | 2017-02-13 18:46:36 -0800 |
|---|---|---|
| committer | Mathias Agopian <mathias@google.com> | 2017-02-17 12:25:26 -0800 |
| commit | f1cb02e7b53e22655f0e14041b0abf73f51a11b0 (patch) | |
| tree | 195edc39095749375d567bb92bfd95d7e6513cdc /media/mca | |
| parent | 0df4c60716a230e2197c99a2224658efe9839e60 (diff) | |
fallout of splitting rect.h out of libandroid.
- Main goal here: libandroid now links against
libarect and export its includes.
- Also fix some wrongful makefiles that included
headers without proper dependency list.
Test: built and booted device
Bug: 35164655
Change-Id: Iae17b966bba00fe53424486a75eebff468873787
Diffstat (limited to 'media/mca')
| -rw-r--r-- | media/mca/filterfw/jni/Android.mk | 2 | ||||
| -rw-r--r-- | media/mca/filterfw/native/Android.mk | 2 | ||||
| -rw-r--r-- | media/mca/filterfw/native/core/gl_env.cpp | 3 | ||||
| -rw-r--r-- | media/mca/filterfw/native/core/gl_env.h | 5 |
4 files changed, 9 insertions, 3 deletions
diff --git a/media/mca/filterfw/jni/Android.mk b/media/mca/filterfw/jni/Android.mk index 40576a0996d9..9842e701fbc9 100644 --- a/media/mca/filterfw/jni/Android.mk +++ b/media/mca/filterfw/jni/Android.mk @@ -43,6 +43,6 @@ LOCAL_C_INCLUDES += \ LOCAL_CFLAGS += -Wall -Werror -Wunused -Wunreachable-code -Wno-unused-parameter -LOCAL_SHARED_LIBRARIES := libmedia +LOCAL_SHARED_LIBRARIES := libmedia libgui libandroid include $(BUILD_STATIC_LIBRARY) diff --git a/media/mca/filterfw/native/Android.mk b/media/mca/filterfw/native/Android.mk index 7c4703fd5172..2e900fe29e38 100644 --- a/media/mca/filterfw/native/Android.mk +++ b/media/mca/filterfw/native/Android.mk @@ -41,6 +41,8 @@ LOCAL_EXPORT_LDLIBS := -llog -lgcc LOCAL_CFLAGS += -Wall -Werror -Wunused -Wunreachable-code +LOCAL_STATIC_LIBRARIES := libarect + # TODO: Build a shared library as well? include $(BUILD_STATIC_LIBRARY) diff --git a/media/mca/filterfw/native/core/gl_env.cpp b/media/mca/filterfw/native/core/gl_env.cpp index c9d33da58a09..1bb82f88ba48 100644 --- a/media/mca/filterfw/native/core/gl_env.cpp +++ b/media/mca/filterfw/native/core/gl_env.cpp @@ -26,7 +26,10 @@ #include <string> #include <EGL/eglext.h> +#include <gui/BufferQueue.h> +#include <gui/Surface.h> #include <gui/GLConsumer.h> +#include <gui/IGraphicBufferProducer.h> namespace android { namespace filterfw { diff --git a/media/mca/filterfw/native/core/gl_env.h b/media/mca/filterfw/native/core/gl_env.h index a709638f1c34..04453016dc93 100644 --- a/media/mca/filterfw/native/core/gl_env.h +++ b/media/mca/filterfw/native/core/gl_env.h @@ -27,8 +27,9 @@ #include <GLES2/gl2.h> #include <EGL/egl.h> -#include <gui/IGraphicBufferProducer.h> -#include <gui/Surface.h> +#include <utils/StrongPointer.h> + +struct ANativeWindow; namespace android { |