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

Commit 4d454439 authored by Dan Willemsen's avatar Dan Willemsen Committed by Gerrit Code Review
Browse files

Merge "Remove obsolete include path from makefiles"

parents d96e6279 a117e055

services/audiopolicy/Android.mk

+0 −2
Original line number Original line Diff line number Diff line
@@ -13,7 +13,6 @@ LOCAL_C_INCLUDES := \ 
    $(call include-path-for, audio-utils) \

    $(call include-path-for, audio-utils) \

    frameworks/av/services/audiopolicy/common/include \

    frameworks/av/services/audiopolicy/common/include \

    frameworks/av/services/audiopolicy/engine/interface \

    frameworks/av/services/audiopolicy/engine/interface \

    frameworks/av/services/audiopolicy/utilities





LOCAL_SHARED_LIBRARIES := \

LOCAL_SHARED_LIBRARIES := \

    libcutils \

    libcutils \
@@ -74,7 +73,6 @@ endif # ifeq ($(USE_CONFIGURABLE_AUDIO_POLICY), 1) 
LOCAL_C_INCLUDES += \

LOCAL_C_INCLUDES += \

    frameworks/av/services/audiopolicy/common/include \

    frameworks/av/services/audiopolicy/common/include \

    frameworks/av/services/audiopolicy/engine/interface \

    frameworks/av/services/audiopolicy/engine/interface \

    frameworks/av/services/audiopolicy/utilities





LOCAL_STATIC_LIBRARIES := \

LOCAL_STATIC_LIBRARIES := \

    libaudiopolicycomponents

    libaudiopolicycomponents

services/audiopolicy/common/managerdefinitions/Android.mk

+1 −2
Original line number Original line Diff line number Diff line
@@ -35,8 +35,7 @@ LOCAL_C_INCLUDES := \ 
    $(LOCAL_PATH)/include \

    $(LOCAL_PATH)/include \

    frameworks/av/services/audiopolicy/common/include \

    frameworks/av/services/audiopolicy/common/include \

    frameworks/av/services/audiopolicy \

    frameworks/av/services/audiopolicy \

    frameworks/av/services/audiopolicy/utilities \

    $(call include-path-for, audio-utils) \

    system/media/audio_utils/include \





ifeq ($(USE_XML_AUDIO_POLICY_CONF), 1)

ifeq ($(USE_XML_AUDIO_POLICY_CONF), 1)

services/audiopolicy/engineconfigurable/wrapper/Android.mk

+0 −1
Original line number Original line Diff line number Diff line
@@ -10,7 +10,6 @@ LOCAL_C_INCLUDES := \ 
    $(LOCAL_PATH)/include \

    $(LOCAL_PATH)/include \

    frameworks/av/services/audiopolicy/engineconfigurable/include \

    frameworks/av/services/audiopolicy/engineconfigurable/include \

    frameworks/av/services/audiopolicy/engineconfigurable/interface \

    frameworks/av/services/audiopolicy/engineconfigurable/interface \

    frameworks/av/services/audiopolicy/utilities/convert \





LOCAL_SRC_FILES:= ParameterManagerWrapper.cpp

LOCAL_SRC_FILES:= ParameterManagerWrapper.cpp

services/audiopolicy/tests/Android.mk

+0 −1
Original line number Original line Diff line number Diff line
@@ -6,7 +6,6 @@ LOCAL_C_INCLUDES := \ 
  frameworks/av/services/audiopolicy \

  frameworks/av/services/audiopolicy \

  frameworks/av/services/audiopolicy/common/include \

  frameworks/av/services/audiopolicy/common/include \

  frameworks/av/services/audiopolicy/engine/interface \

  frameworks/av/services/audiopolicy/engine/interface \

  frameworks/av/services/audiopolicy/utilities





LOCAL_SHARED_LIBRARIES := \

LOCAL_SHARED_LIBRARIES := \

  libaudiopolicymanagerdefault \

  libaudiopolicymanagerdefault \