From 950fe8f8d4d654e645fa7205ca275b5a03feb214 Mon Sep 17 00:00:00 2001 From: Derek Sollenberger Date: Thu, 27 Feb 2014 11:14:55 -0500 Subject: [PATCH] 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 --- cmds/screencap/Android.mk | 7 ------- core/jni/Android.mk | 2 -- libs/hwui/Android.mk | 7 +------ libs/input/Android.mk | 1 - media/tests/omxjpegdecoder/Android.mk | 5 ----- native/graphics/jni/Android.mk | 1 - services/core/jni/Android.mk | 1 - 7 files changed, 1 insertion(+), 23 deletions(-) diff --git a/cmds/screencap/Android.mk b/cmds/screencap/Android.mk index ca8008bdba313..5c11b7546f849 100644 --- a/cmds/screencap/Android.mk +++ b/cmds/screencap/Android.mk @@ -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) diff --git a/core/jni/Android.mk b/core/jni/Android.mk index 5056c57847baa..cf69d9eea956e 100644 --- a/core/jni/Android.mk +++ b/core/jni/Android.mk @@ -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 \ diff --git a/libs/hwui/Android.mk b/libs/hwui/Android.mk index 495ad195d130b..2cc7a848d8981 100644 --- a/libs/hwui/Android.mk +++ b/libs/hwui/Android.mk @@ -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 diff --git a/libs/input/Android.mk b/libs/input/Android.mk index 6011ff03c1c86..a7fb0e2124898 100644 --- a/libs/input/Android.mk +++ b/libs/input/Android.mk @@ -31,7 +31,6 @@ LOCAL_SHARED_LIBRARIES := \ libinputflinger LOCAL_C_INCLUDES := \ - external/skia/include/core \ frameworks/native/services diff --git a/media/tests/omxjpegdecoder/Android.mk b/media/tests/omxjpegdecoder/Android.mk index ad874c894fd1d..95ae33bc29a14 100644 --- a/media/tests/omxjpegdecoder/Android.mk +++ b/media/tests/omxjpegdecoder/Android.mk @@ -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/ \ diff --git a/native/graphics/jni/Android.mk b/native/graphics/jni/Android.mk index 8b333e7294542..31540307f586a 100644 --- a/native/graphics/jni/Android.mk +++ b/native/graphics/jni/Android.mk @@ -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 diff --git a/services/core/jni/Android.mk b/services/core/jni/Android.mk index 7675ba6f62a8f..56144b090fe37 100644 --- a/services/core/jni/Android.mk +++ b/services/core/jni/Android.mk @@ -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 \