fix libgui header location (8335f1cc) · Commits · e / os / android_frameworks_base

cmds/bootanimation/BootAnimation.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -38,8 +38,8 @@
		#include <ui/DisplayInfo.h>
		#include <ui/FramebufferNativeWindow.h>

		#include <surfaceflinger/ISurfaceComposer.h>
		#include <surfaceflinger/ISurfaceComposerClient.h>
		#include <gui/Surface.h>
		#include <gui/SurfaceComposerClient.h>

		#include <core/SkBitmap.h>
		#include <core/SkStream.h>

+3 −4

Original line number	Diff line number	Diff line
		@@ -23,9 +23,6 @@
		#include <androidfw/AssetManager.h>
		#include <utils/threads.h>

		#include <surfaceflinger/ISurfaceComposer.h>
		#include <surfaceflinger/SurfaceComposerClient.h>

		#include <EGL/egl.h>
		#include <GLES/gl.h>

		@@ -33,7 +30,9 @@ class SkBitmap;

		namespace android {

		class AssetManager;
		class Surface;
		class SurfaceComposerClient;
		class SurfaceControl;

		// ---------------------------------------------------------------------------

+0 −2

Original line number	Diff line number	Diff line
		@@ -25,8 +25,6 @@
		#include <utils/Log.h>
		#include <utils/threads.h>

		#include <surfaceflinger/ISurfaceComposer.h>

		#if defined(HAVE_PTHREADS)
		# include <pthread.h>
		# include <sys/resource.h>

+1 −1

Original line number	Diff line number	Diff line
		@@ -24,7 +24,7 @@
		#include <sys/mman.h>

		#include <binder/IMemory.h>
		#include <surfaceflinger/SurfaceComposerClient.h>
		#include <gui/SurfaceComposerClient.h>

		#include <SkImageEncoder.h>
		#include <SkBitmap.h>

+1 −1

Original line number	Diff line number	Diff line
		@@ -30,7 +30,7 @@
		#include <media/stagefright/MediaCodec.h>
		#include <media/stagefright/MediaDefs.h>
		#include <media/stagefright/NuMediaExtractor.h>
		#include <surfaceflinger/SurfaceComposerClient.h>
		#include <gui/SurfaceComposerClient.h>

		static void usage(const char *me) {
		fprintf(stderr, "usage: %s [-a] use audio\n"