fix libgui header location (90ac7992) · Commits · e / os / android_frameworks_native

include/gui/BufferQueue.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -19,9 +19,9 @@

		#include <EGL/egl.h>

		#include <gui/IGraphicBufferAlloc.h>
		#include <gui/ISurfaceTexture.h>

		#include <surfaceflinger/IGraphicBufferAlloc.h>
		#include <ui/GraphicBuffer.h>

		#include <utils/String8.h>

+5 −5

Original line number	Diff line number	Diff line
		@@ -14,15 +14,15 @@
		* limitations under the License.
		*/

		#ifndef ANDROID_SF_IGRAPHIC_BUFFER_ALLOC_H
		#define ANDROID_SF_IGRAPHIC_BUFFER_ALLOC_H
		#ifndef ANDROID_GUI_IGRAPHIC_BUFFER_ALLOC_H
		#define ANDROID_GUI_IGRAPHIC_BUFFER_ALLOC_H

		#include <stdint.h>
		#include <sys/types.h>

		#include <utils/RefBase.h>

		#include <binder/IInterface.h>
		#include <ui/PixelFormat.h>
		#include <utils/RefBase.h>

		namespace android {
		// ----------------------------------------------------------------------------
		@@ -55,4 +55,4 @@ public:

		}; // namespace android

		#endif // ANDROID_SF_IGRAPHIC_BUFFER_ALLOC_H
		#endif // ANDROID_GUI_IGRAPHIC_BUFFER_ALLOC_H

+3 −3

Original line number	Diff line number	Diff line
		@@ -14,8 +14,8 @@
		* limitations under the License.
		*/

		#ifndef ANDROID_SF_ISURFACE_H
		#define ANDROID_SF_ISURFACE_H
		#ifndef ANDROID_GUI_ISURFACE_H
		#define ANDROID_GUI_ISURFACE_H

		#include <stdint.h>
		#include <sys/types.h>
		@@ -61,4 +61,4 @@ public:

		}; // namespace android

		#endif // ANDROID_SF_ISURFACE_H
		#endif // ANDROID_GUI_ISURFACE_H

+5 −5

Original line number	Diff line number	Diff line
		@@ -14,8 +14,8 @@
		* limitations under the License.
		*/

		#ifndef ANDROID_SF_ISURFACE_COMPOSER_H
		#define ANDROID_SF_ISURFACE_COMPOSER_H
		#ifndef ANDROID_GUI_ISURFACE_COMPOSER_H
		#define ANDROID_GUI_ISURFACE_COMPOSER_H

		#include <stdint.h>
		#include <sys/types.h>
		@@ -27,8 +27,8 @@

		#include <ui/PixelFormat.h>

		#include <surfaceflinger/ISurfaceComposerClient.h>
		#include <surfaceflinger/IGraphicBufferAlloc.h>
		#include <gui/IGraphicBufferAlloc.h>
		#include <gui/ISurfaceComposerClient.h>

		namespace android {
		// ----------------------------------------------------------------------------
		@@ -171,4 +171,4 @@ public:

		}; // namespace android

		#endif // ANDROID_SF_ISURFACE_COMPOSER_H
		#endif // ANDROID_GUI_ISURFACE_COMPOSER_H

+4 −4

Original line number	Diff line number	Diff line
		@@ -14,8 +14,8 @@
		* limitations under the License.
		*/

		#ifndef ANDROID_SF_ISURFACE_COMPOSER_CLIENT_H
		#define ANDROID_SF_ISURFACE_COMPOSER_CLIENT_H
		#ifndef ANDROID_GUI_ISURFACE_COMPOSER_CLIENT_H
		#define ANDROID_GUI_ISURFACE_COMPOSER_CLIENT_H

		#include <stdint.h>
		#include <sys/types.h>
		@@ -27,7 +27,7 @@

		#include <ui/PixelFormat.h>

		#include <surfaceflinger/ISurface.h>
		#include <gui/ISurface.h>

		namespace android {

		@@ -81,4 +81,4 @@ public:

		}; // namespace android

		#endif // ANDROID_SF_ISURFACE_COMPOSER_CLIENT_H
		#endif // ANDROID_GUI_ISURFACE_COMPOSER_CLIENT_H