commit 681caefc7d3db69952daf1536513070c50b99635
author Elliott Hughes <enh@google.com> Fri Sep 16 08:49:16 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Sep 16 08:49:16 2016 +0000
tree 8142fa1c49ce859d90aff0f829d07e5cd3b8eab1
parent 3de6a5bdf8bb01cbbcd3f446c646fc14f82c8938
parent b58c4e1bbd4e2420614e1bfe13f885e502301b63

Merge "Stop including libcore/include/ in frameworks/av." am: adc9ba6520 am: c75164b942 am: 16fbb20e73
am: b58c4e1bbd

Change-Id: Iaf5158ff00eac7f4aff21eb7c3c31d62ec92ee33

drm/libmediadrm/Android.mk

diff --git a/drm/libmediadrm/Android.mk b/drm/libmediadrm/Android.mk
index 6a2ed31..f1c6b00 100644
--- a/drm/libmediadrm/Android.mk
+++ b/drm/libmediadrm/Android.mk
@@ -23,9 +23,6 @@
 	libstagefright_foundation \
 	libutils
 
-LOCAL_C_INCLUDES := \
-    libcore/include
-
 LOCAL_CFLAGS += -Werror -Wno-error=deprecated-declarations -Wall
 LOCAL_CLANG := true
 

media/libmediaplayerservice/Android.mk

diff --git a/media/libmediaplayerservice/Android.mk b/media/libmediaplayerservice/Android.mk
index 31a6992..98ccc42 100644
--- a/media/libmediaplayerservice/Android.mk
+++ b/media/libmediaplayerservice/Android.mk
@@ -55,7 +55,6 @@
     $(TOP)/frameworks/native/include/media/openmax                  \
     $(TOP)/frameworks/native/include/media/hardware                 \
     $(TOP)/external/tremolo/Tremolo                                 \
-    libcore/include                                                 \
 
 LOCAL_CFLAGS += -Werror -Wno-error=deprecated-declarations -Wall
 LOCAL_CLANG := true

services/audioflinger/Android.mk

diff --git a/services/audioflinger/Android.mk b/services/audioflinger/Android.mk
index 414cce8..068b917 100644
--- a/services/audioflinger/Android.mk
+++ b/services/audioflinger/Android.mk
@@ -40,7 +40,6 @@
 LOCAL_C_INCLUDES := \
     $(TOPDIR)frameworks/av/services/audiopolicy \
     $(TOPDIR)external/sonic \
-    libcore/include \
     $(call include-path-for, audio-effects) \
     $(call include-path-for, audio-utils)