From f0c606eb3e481050fd1dacd52694bacb794a4736 Mon Sep 17 00:00:00 2001
From: Elliott Hughes <enh@google.com>
Date: Thu, 15 Sep 2016 13:13:39 -0700
Subject: [PATCH] Stop including libcore/include/ in most of frameworks/base.
frameworks/base/core/jni/android_text_StaticLayout.cpp does actually use
ScopedIcuLocale, so I've left that for now.
Change-Id: I6458cd133871281a747a9da2e304da10b445051a
---
drm/jni/Android.mk | 1 -
services/core/jni/Android.mk | 2 --
2 files changed, 3 deletions(-)
diff --git a/drm/jni/Android.mk b/drm/jni/Android.mk
index 08c7b953b813..d0797a9849cd 100644
--- a/drm/jni/Android.mk
+++ b/drm/jni/Android.mk
@@ -37,7 +37,6 @@ LOCAL_C_INCLUDES += \
$(TOP)/frameworks/av/drm/libdrmframework/include \
$(TOP)/frameworks/av/drm/libdrmframework/plugins/common/include \
$(TOP)/frameworks/av/include \
- $(TOP)/libcore/include
LOCAL_MODULE_TAGS := optional
diff --git a/services/core/jni/Android.mk b/services/core/jni/Android.mk
index a502c3ac7b1a..ac55a7eec21c 100644
--- a/services/core/jni/Android.mk
+++ b/services/core/jni/Android.mk
@@ -45,8 +45,6 @@ LOCAL_C_INCLUDES += \
frameworks/base/libs/hwui \
frameworks/base/core/jni \
frameworks/native/services \
- libcore/include \
- libcore/include/libsuspend \
system/security/keystore/include \
$(call include-path-for, libhardware)/hardware \
$(call include-path-for, libhardware_legacy)/hardware_legacy \
--
GitLab