summaryrefslogtreecommitdiffstats
path: root/cmds/bootanimation
diff options
context:
space:
mode:
authorDerek Sollenberger <djsollen@google.com>2014-02-27 14:31:29 -0500
committerDerek Sollenberger <djsollen@google.com>2014-02-27 14:31:29 -0500
commiteece0dda56ae29fff6e9003df97594f6ac50b6e2 (patch)
tree46e4cd73a189dabb2e28d2eafaef2b9abf73a82f /cmds/bootanimation
parent94b5ca811e5716bddb4a4d86df35c29bb9165e5f (diff)
downloadframeworks_base-eece0dda56ae29fff6e9003df97594f6ac50b6e2.zip
frameworks_base-eece0dda56ae29fff6e9003df97594f6ac50b6e2.tar.gz
frameworks_base-eece0dda56ae29fff6e9003df97594f6ac50b6e2.tar.bz2
Fix includes so that they no longer rely on the global Skia includes directories.
bug:13225538 Change-Id: Ia5d816dc665f81c7985f21036af4fd0a63c560cf
Diffstat (limited to 'cmds/bootanimation')
-rw-r--r--cmds/bootanimation/Android.mk3
-rw-r--r--cmds/bootanimation/BootAnimation.cpp6
2 files changed, 3 insertions, 6 deletions
diff --git a/cmds/bootanimation/Android.mk b/cmds/bootanimation/Android.mk
index d5ff84e..a4e2718 100644
--- a/cmds/bootanimation/Android.mk
+++ b/cmds/bootanimation/Android.mk
@@ -19,9 +19,6 @@ LOCAL_SHARED_LIBRARIES := \
libGLESv1_CM \
libgui
-LOCAL_C_INCLUDES := \
- $(call include-path-for, corecg graphics)
-
LOCAL_MODULE:= bootanimation
diff --git a/cmds/bootanimation/BootAnimation.cpp b/cmds/bootanimation/BootAnimation.cpp
index 125bea6..e12e961 100644
--- a/cmds/bootanimation/BootAnimation.cpp
+++ b/cmds/bootanimation/BootAnimation.cpp
@@ -42,9 +42,9 @@
#include <gui/Surface.h>
#include <gui/SurfaceComposerClient.h>
-#include <core/SkBitmap.h>
-#include <core/SkStream.h>
-#include <core/SkImageDecoder.h>
+#include <SkBitmap.h>
+#include <SkStream.h>
+#include <SkImageDecoder.h>
#include <GLES/gl.h>
#include <GLES/glext.h>