From aa4267216542e1ce0320a6794a200c33f0aad34d Mon Sep 17 00:00:00 2001 From: Derek Sollenberger Date: Thu, 27 Feb 2014 14:02:37 -0500 Subject: [PATCH] Remove global Skia includes and associated shortcuts. bug:13225538 Change-Id: I7deff74f5c0cd7b6ad0e120ffbc378c5eb8d75ee --- core/config.mk | 3 +-- core/pathmap.mk | 2 -- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/core/config.mk b/core/config.mk index c422bc8d4..57076ac43 100644 --- 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 8e441c4f4..3820f9a2b 100644 --- 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 \