Remove global Skia includes and associated shortcuts.

bug:13225538
Change-Id: I7deff74f5c0cd7b6ad0e120ffbc378c5eb8d75ee

diff --git a/core/config.mk b/core/config.mk
index c422bc8..57076ac 100644 (file)
--- a/core/config.mk
+++ b/core/config.mk
@@ -37,8 +37,7 @@ SRC_HEADERS := \
        $(TOPDIR)frameworks/native/include \
        $(TOPDIR)frameworks/native/opengl/include \
        $(TOPDIR)frameworks/av/include \
-       $(TOPDIR)frameworks/base/include \
-       $(TOPDIR)external/skia/include
+       $(TOPDIR)frameworks/base/include
 SRC_HOST_HEADERS:=$(TOPDIR)tools/include
 SRC_LIBRARIES:= $(TOPDIR)libs
 SRC_SERVERS:= $(TOPDIR)servers

diff --git a/core/pathmap.mk b/core/pathmap.mk
index 8e441c4..3820f9a 100644 (file)
--- a/core/pathmap.mk
+++ b/core/pathmap.mk
@@ -29,10 +29,8 @@
 pathmap_INCL := \
     bootloader:bootable/bootloader/legacy/include \
     camera:system/media/camera/include \
-    corecg:external/skia/include/core \
     frameworks-base:frameworks/base/include \
     frameworks-native:frameworks/native/include \
-    graphics:external/skia/include/core \
     libc:bionic/libc/include \
     libhardware:hardware/libhardware/include \
     libhardware_legacy:hardware/libhardware_legacy/include \