fallout of splitting rect.h out of libandroid.
A lot of media makefiles didn’t specify libui or
libgui but included headers from these libraries
directly.
It works because these headers are on the global
include path. With this change, though, rect.h
is not anymore (albeit exported from libui).
Test: built and booted device
Bug: 35164655
Change-Id: I72e8f0b7bd25c6a67eedc17afe52c4c484a147fe
diff --git a/camera/cameraserver/Android.mk b/camera/cameraserver/Android.mk
index bdafff1..1548e64 100644
--- a/camera/cameraserver/Android.mk
+++ b/camera/cameraserver/Android.mk
@@ -23,6 +23,7 @@
libcameraservice \
liblog \
libutils \
+ libui \
libbinder \
android.hardware.camera.common@1.0 \
android.hardware.camera.provider@2.4 \
diff --git a/include/media/IOMX.h b/include/media/IOMX.h
index ec1d4b6..39b9ad4 100644
--- a/include/media/IOMX.h
+++ b/include/media/IOMX.h
@@ -19,9 +19,9 @@
#define ANDROID_IOMX_H_
#include <binder/IInterface.h>
-#include <gui/IGraphicBufferProducer.h>
#include <utils/List.h>
#include <utils/String8.h>
+#include <cutils/native_handle.h>
#include <list>
diff --git a/include/media/stagefright/ACodec.h b/include/media/stagefright/ACodec.h
index 90d9942..a1422ff 100644
--- a/include/media/stagefright/ACodec.h
+++ b/include/media/stagefright/ACodec.h
@@ -29,6 +29,7 @@
#include <media/stagefright/SkipCutBuffer.h>
#include <utils/NativeHandle.h>
#include <OMX_Audio.h>
+#include <hardware/gralloc.h>
#define TRACK_BUFFER_TIMING 0
diff --git a/include/ndk/NdkMediaCodec.h b/include/ndk/NdkMediaCodec.h
index ad17321..a63f39a 100644
--- a/include/ndk/NdkMediaCodec.h
+++ b/include/ndk/NdkMediaCodec.h
@@ -29,8 +29,6 @@
#include <sys/cdefs.h>
-#include <android/native_window.h>
-
#include "NdkMediaCrypto.h"
#include "NdkMediaError.h"
#include "NdkMediaFormat.h"
@@ -39,6 +37,8 @@
extern "C" {
#endif
+struct ANativeWindow;
+
#if __ANDROID_API__ >= 21
struct AMediaCodec;
diff --git a/media/libmedia/IOMX.cpp b/media/libmedia/IOMX.cpp
index 3d466b1..67939b2 100644
--- a/media/libmedia/IOMX.cpp
+++ b/media/libmedia/IOMX.cpp
@@ -25,8 +25,9 @@
#include <media/IOMX.h>
#include <media/stagefright/foundation/ADebug.h>
#include <media/openmax/OMX_IndexExt.h>
-#include <utils/NativeHandle.h>
#include <media/OMXBuffer.h>
+#include <utils/NativeHandle.h>
+#include <gui/IGraphicBufferProducer.h>
#include <android/IGraphicBufferSource.h>
#include <android/IOMXBufferSource.h>
diff --git a/media/libmediaplayerservice/nuplayer/Android.mk b/media/libmediaplayerservice/nuplayer/Android.mk
index 8686560..56c558d 100644
--- a/media/libmediaplayerservice/nuplayer/Android.mk
+++ b/media/libmediaplayerservice/nuplayer/Android.mk
@@ -35,6 +35,7 @@
LOCAL_SHARED_LIBRARIES := \
libbinder \
+ libui \
libmedia \
libmediadrm \
diff --git a/media/libstagefright/codecs/avcenc/SoftAVCEnc.cpp b/media/libstagefright/codecs/avcenc/SoftAVCEnc.cpp
index 9e7a3be..b057ffe 100644
--- a/media/libstagefright/codecs/avcenc/SoftAVCEnc.cpp
+++ b/media/libstagefright/codecs/avcenc/SoftAVCEnc.cpp
@@ -30,7 +30,6 @@
#include <media/stagefright/Utils.h>
#include <OMX_IndexExt.h>
#include <OMX_VideoExt.h>
-#include <ui/Rect.h>
#include "ih264_typedefs.h"
#include "iv2.h"
diff --git a/media/libstagefright/codecs/m4v_h263/enc/SoftMPEG4Encoder.cpp b/media/libstagefright/codecs/m4v_h263/enc/SoftMPEG4Encoder.cpp
index d5a26d3..6d4cb69 100644
--- a/media/libstagefright/codecs/m4v_h263/enc/SoftMPEG4Encoder.cpp
+++ b/media/libstagefright/codecs/m4v_h263/enc/SoftMPEG4Encoder.cpp
@@ -30,8 +30,6 @@
#include <media/stagefright/MediaErrors.h>
#include <media/stagefright/MetaData.h>
#include <media/stagefright/Utils.h>
-#include <ui/Rect.h>
-#include <ui/GraphicBufferMapper.h>
#include "SoftMPEG4Encoder.h"
diff --git a/media/libstagefright/colorconversion/Android.mk b/media/libstagefright/colorconversion/Android.mk
index ba74740..1e82727 100644
--- a/media/libstagefright/colorconversion/Android.mk
+++ b/media/libstagefright/colorconversion/Android.mk
@@ -10,6 +10,9 @@
$(TOP)/hardware/msm7k \
$(TOP)/external/libyuv/files/include
+LOCAL_SHARED_LIBRARIES := \
+ libui \
+
LOCAL_STATIC_LIBRARIES := \
libyuv_static \
diff --git a/media/libstagefright/colorconversion/SoftwareRenderer.cpp b/media/libstagefright/colorconversion/SoftwareRenderer.cpp
index bbc4d26..54487b3 100644
--- a/media/libstagefright/colorconversion/SoftwareRenderer.cpp
+++ b/media/libstagefright/colorconversion/SoftwareRenderer.cpp
@@ -24,7 +24,8 @@
#include <media/stagefright/foundation/AMessage.h>
#include <system/window.h>
#include <ui/GraphicBufferMapper.h>
-#include <gui/IGraphicBufferProducer.h>
+#include <ui/GraphicBuffer.h>
+#include <ui/Rect.h>
namespace android {
diff --git a/media/libstagefright/filters/Android.mk b/media/libstagefright/filters/Android.mk
index 830d2aa..07b2eb8 100644
--- a/media/libstagefright/filters/Android.mk
+++ b/media/libstagefright/filters/Android.mk
@@ -23,6 +23,7 @@
LOCAL_CFLAGS += -Wno-multichar -Werror -Wall
LOCAL_SHARED_LIBRARIES := \
+ libgui \
libmedia \
libhidlmemory \
diff --git a/media/libstagefright/foundation/Android.bp b/media/libstagefright/foundation/Android.bp
index f7bd3f2..0557d95 100644
--- a/media/libstagefright/foundation/Android.bp
+++ b/media/libstagefright/foundation/Android.bp
@@ -29,12 +29,13 @@
shared_libs: [
"libbinder",
"libutils",
+ "libui",
"libcutils",
"liblog",
"libpowermanager",
],
- export_shared_lib_headers: ["libbinder"],
+ export_shared_lib_headers: ["libbinder", "libui"],
cflags: [
"-Wno-multichar",
diff --git a/media/libstagefright/include/OMXNodeInstance.h b/media/libstagefright/include/OMXNodeInstance.h
index c7e60ca..8e08d15 100644
--- a/media/libstagefright/include/OMXNodeInstance.h
+++ b/media/libstagefright/include/OMXNodeInstance.h
@@ -30,6 +30,7 @@
#include <android/hidl/memory/1.0/IMemory.h>
namespace android {
+class GraphicBuffer;
class IOMXBufferSource;
class IOMXObserver;
struct OMXMaster;
diff --git a/media/libstagefright/omx/SoftVideoEncoderOMXComponent.cpp b/media/libstagefright/omx/SoftVideoEncoderOMXComponent.cpp
index adf846a..c49403d 100644
--- a/media/libstagefright/omx/SoftVideoEncoderOMXComponent.cpp
+++ b/media/libstagefright/omx/SoftVideoEncoderOMXComponent.cpp
@@ -30,8 +30,8 @@
#include <media/stagefright/foundation/AUtils.h>
#include <media/stagefright/MediaDefs.h>
-#include <ui/GraphicBuffer.h>
#include <ui/GraphicBufferMapper.h>
+#include <ui/Rect.h>
#include <OMX_IndexExt.h>
diff --git a/services/camera/libcameraservice/gui/RingBufferConsumer.h b/services/camera/libcameraservice/gui/RingBufferConsumer.h
index 28dc5d5..2bafe4a 100644
--- a/services/camera/libcameraservice/gui/RingBufferConsumer.h
+++ b/services/camera/libcameraservice/gui/RingBufferConsumer.h
@@ -19,18 +19,16 @@
#include <gui/BufferItem.h>
#include <gui/ConsumerBase.h>
+#include <gui/BufferQueue.h>
-#include <ui/GraphicBuffer.h>
-
-#include <utils/String8.h>
-#include <utils/Vector.h>
-#include <utils/threads.h>
#include <utils/List.h>
#define ANDROID_GRAPHICS_RINGBUFFERCONSUMER_JNI_ID "mRingBufferConsumer"
namespace android {
+class String8;
+
/**
* The RingBufferConsumer maintains a ring buffer of BufferItem objects,
* (which are 'acquired' as long as they are part of the ring buffer, and
diff --git a/services/mediacodec/Android.mk b/services/mediacodec/Android.mk
index cb14bb5..6dcc35c 100644
--- a/services/mediacodec/Android.mk
+++ b/services/mediacodec/Android.mk
@@ -6,6 +6,7 @@
LOCAL_SHARED_LIBRARIES := \
libmedia \
libbinder \
+ libgui \
libutils \
liblog \
libstagefright_omx
@@ -26,6 +27,7 @@
libmediacodecservice \
libbinder \
libutils \
+ libgui \
liblog \
libbase \
libavservices_minijail \