Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup unnecessary includes for libskia.

Browse Source 
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
This commit is contained in:
Derek Sollenberger
2014-02-27 11:14:55 -05:00
parent 94b5ca811e
commit 950fe8f8d4
7 changed files with 1 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cmds/screencap/Android.mk
View File

@@ -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)

2
core/jni/Android.mk
View File

@@ -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 \

7
libs/hwui/Android.mk
View File

@@ -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

1
libs/input/Android.mk
View File

@@ -31,7 +31,6 @@ LOCAL_SHARED_LIBRARIES := \
libinputflinger
LOCAL_C_INCLUDES := \
external/skia/include/core \
frameworks/native/services

5
media/tests/omxjpegdecoder/Android.mk
View File

@@ -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/ \

1
native/graphics/jni/Android.mk
View File

@@ -23,7 +23,6 @@ LOCAL_SHARED_LIBRARIES := \
libskia
LOCAL_C_INCLUDES += \
external/skia/include/core \
frameworks/base/native/include \
frameworks/base/core/jni/android/graphics

1
services/core/jni/Android.mk
View File

@@ -30,7 +30,6 @@ LOCAL_C_INCLUDES += \
frameworks/base/libs \
frameworks/base/core/jni \
frameworks/native/services \
external/skia/include/core \
libcore/include \
libcore/include/libsuspend \
$(call include-path-for, libhardware)/hardware \