Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 239fb192 authored Feb 17, 2017 by TreeHugger Robot Committed by Android (Google) Code Review Feb 17, 2017

Merge "fallout of splitting rect.h out of libandroid."

parents c445da8f f1cb02e7

core/jni/android/graphics/SurfaceTexture.cpp

+1 −0

Original line number	Diff line number	Diff line
		@@ -25,6 +25,7 @@

		#include <gui/GLConsumer.h>
		#include <gui/Surface.h>
		#include <gui/BufferQueue.h>

		#include "core_jni_helpers.h"

media/mca/filterfw/jni/Android.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -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)

media/mca/filterfw/native/Android.mk

+2 −0

Original line number	Diff line number	Diff line
		@@ -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)

media/mca/filterfw/native/core/gl_env.cpp

+3 −0

Original line number	Diff line number	Diff line
		@@ -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 {

media/mca/filterfw/native/core/gl_env.h

+3 −2

Original line number	Diff line number	Diff line
		@@ -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 {