Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b58c4e1b authored by Elliott Hughes's avatar Elliott Hughes Committed by android-build-merger
Browse files

Merge "Stop including libcore/include/ in frameworks/av." am: adc9ba65 am: c75164b9 

am: 16fbb20e

Change-Id: I751944e050b849e18c78857f64134ba54d0978eb
parents 45c5d1a5 16fbb20e

drm/libmediadrm/Android.mk

+0 −3
Original line number Diff line number Diff line
@@ -23,9 +23,6 @@ LOCAL_SHARED_LIBRARIES := \ 
	libstagefright_foundation \

	libutils



LOCAL_C_INCLUDES := \

    libcore/include



LOCAL_CFLAGS += -Werror -Wno-error=deprecated-declarations -Wall

LOCAL_CLANG := true

media/libmediaplayerservice/Android.mk

+0 −1
Original line number Diff line number Diff line
@@ -55,7 +55,6 @@ LOCAL_C_INCLUDES := \ 
    $(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

+0 −1
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ LOCAL_SRC_FILES:= \ 
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)