Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fc927634 authored by Derek Sollenberger's avatar Derek Sollenberger Committed by Android (Google) Code Review
Browse files

Merge "Fix includes so that they no longer rely on the global Skia includes directories."

parents ef238651 eece0dda

cmds/bootanimation/Android.mk

+0 −3
Original line number Diff line number Diff line
@@ -19,9 +19,6 @@ LOCAL_SHARED_LIBRARIES := \ 
    libGLESv1_CM \

    libgui



LOCAL_C_INCLUDES := \

	$(call include-path-for, corecg graphics)



LOCAL_MODULE:= bootanimation

cmds/bootanimation/BootAnimation.cpp

+3 −3
Original line number Diff line number Diff line
@@ -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>

core/jni/android/graphics/Path.cpp

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
#include <android_runtime/AndroidRuntime.h>



#include "SkPath.h"

#include "pathops/SkPathOps.h"

#include "SkPathOps.h"



#include <Caches.h>

#include <vector>

core/jni/android/opengl/util.cpp

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
#include <GLES/gl.h>

#include <ETC1/etc1.h>



#include <core/SkBitmap.h>

#include <SkBitmap.h>



#include "android_runtime/AndroidRuntime.h"

media/jni/Android.mk

+1 −2
Original line number Diff line number Diff line
@@ -61,8 +61,7 @@ LOCAL_C_INCLUDES += \ 
    $(call include-path-for, libhardware)/hardware \

    system/media/camera/include \

    $(PV_INCLUDES) \

    $(JNI_H_INCLUDE) \

    $(call include-path-for, corecg graphics)

    $(JNI_H_INCLUDE)



LOCAL_CFLAGS +=