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

core/jni/android/graphics/SurfaceTexture.cpp

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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 {
 

native/android/Android.mk

@@ -37,7 +37,8 @@ LOCAL_SHARED_LIBRARIES := \
     libnetd_client \
 
 LOCAL_STATIC_LIBRARIES := \
-    libstorage
+    libstorage \
+    libarect
 
 LOCAL_C_INCLUDES += \
     frameworks/base/native/include \
@@ -45,6 +46,8 @@ LOCAL_C_INCLUDES += \
     bionic/libc/dns/include \
     system/netd/include \
 
+LOCAL_EXPORT_STATIC_LIBRARY_HEADERS := libarect
+
 LOCAL_MODULE := libandroid
 
 LOCAL_CFLAGS += $(common_cflags)

native/graphics/jni/Android.mk

@@ -21,6 +21,7 @@ LOCAL_SRC_FILES:= \
 LOCAL_SHARED_LIBRARIES := \
     libandroid_runtime \
     libskia \
+    libui \
     libandroidfw
 
 LOCAL_C_INCLUDES += \