diff options
| author | Derek Sollenberger <djsollen@google.com> | 2014-02-28 13:23:13 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-02-28 13:23:15 +0000 |
| commit | fc9276340897289b8f848fc722152d6fc0f891ed (patch) | |
| tree | 14cca48e01e4c491bd5ffe9499a96cd2e42e9d91 /cmds | |
| parent | ef23865154bf5e6c1768023dd69845353cf8c543 (diff) | |
| parent | eece0dda56ae29fff6e9003df97594f6ac50b6e2 (diff) | |
| download | frameworks_base-fc9276340897289b8f848fc722152d6fc0f891ed.zip frameworks_base-fc9276340897289b8f848fc722152d6fc0f891ed.tar.gz frameworks_base-fc9276340897289b8f848fc722152d6fc0f891ed.tar.bz2 | |
Merge "Fix includes so that they no longer rely on the global Skia includes directories."
Diffstat (limited to 'cmds')
| -rw-r--r-- | cmds/bootanimation/Android.mk | 3 | ||||
| -rw-r--r-- | cmds/bootanimation/BootAnimation.cpp | 6 |
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> |