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

Commit 950fe8f8 authored by Derek Sollenberger's avatar Derek Sollenberger
Browse files

Cleanup unnecessary includes for libskia. 

The libskia target exports all of its public includes directories so
redefining them here is redundant. Also this cleans up and makes it
obvious where the framework is making using of private Skia headers.

Change-Id: Ie7ecc9ddd3df780bed6b9af54ba58ca58274e043
parent 94b5ca81

cmds/screencap/Android.mk

+0 −7
Original line number Diff line number Diff line
@@ -16,11 +16,4 @@ LOCAL_MODULE:= screencap 


LOCAL_MODULE_TAGS := optional



LOCAL_C_INCLUDES += \

	external/skia/include/core \

	external/skia/include/effects \

	external/skia/include/images \

	external/skia/src/ports \

	external/skia/include/utils



include $(BUILD_EXECUTABLE)

core/jni/Android.mk

+0 −2
Original line number Diff line number Diff line
@@ -164,9 +164,7 @@ LOCAL_C_INCLUDES += \ 
	$(TOP)/frameworks/av/include \

	$(TOP)/system/media/camera/include \

	external/skia/src/core \

	external/skia/src/pdf \

	external/skia/src/images \

	external/skia/include/utils \

	external/sqlite/dist \

	external/sqlite/android \

	external/expat/lib \

libs/hwui/Android.mk

+1 −6
Original line number Diff line number Diff line
@@ -61,12 +61,7 @@ ifeq ($(USE_OPENGL_RENDERER),true) 
	LOCAL_C_INCLUDES += \

		$(JNI_H_INCLUDE) \

		$(LOCAL_PATH)/../../include/utils \

		external/skia/include/core \

		external/skia/include/effects \

		external/skia/include/images \

		external/skia/src/core \

		external/skia/src/ports \

		external/skia/include/utils

		external/skia/src/core



	LOCAL_CFLAGS += -DUSE_OPENGL_RENDERER -DEGL_EGLEXT_PROTOTYPES -DGL_GLEXT_PROTOTYPES

	LOCAL_CFLAGS += -Wno-unused-parameter

libs/input/Android.mk

+0 −1
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ LOCAL_SHARED_LIBRARIES := \ 
	libinputflinger



LOCAL_C_INCLUDES := \

    external/skia/include/core \

    frameworks/native/services

media/tests/omxjpegdecoder/Android.mk

+0 −5
Original line number Diff line number Diff line
@@ -34,11 +34,6 @@ LOCAL_SHARED_LIBRARIES := \ 


LOCAL_C_INCLUDES := \

    $(TOP)/external/jpeg \

    $(TOP)/external/skia/include/config \

    $(TOP)/external/skia/include/core \

    $(TOP)/external/skia/include/images \

    $(TOP)/external/skia/include/utils \

    $(TOP)/external/skia/include/effects \

    $(TOP)/frameworks/base/media/libstagefright \

    $(TOP)/frameworks/base/include/ \

    $(TOP)/frameworks/base/ \