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

Commit 6371c436 authored by Dan Willemsen's avatar Dan Willemsen Committed by android-build-merger
Browse files

Merge "Remove LOCAL_COPY_HEADERS from libparameter" am: 76321a33 am: d5eb866c 

am: 9708e85a

Change-Id: I5825cd3bfaeb4fd752f6153274f3a248428c0e65
parents b662e6c2 9708e85a

services/audiopolicy/engineconfigurable/Android.mk

+1 −0
Original line number Original line Diff line number Diff line
@@ -46,6 +46,7 @@ LOCAL_STATIC_LIBRARIES := \ 
    libxml2

    libxml2





LOCAL_SHARED_LIBRARIES := \

LOCAL_SHARED_LIBRARIES := \

    liblog \

    libcutils \

    libcutils \

    libutils \

    libutils \

    libaudioutils \

    libaudioutils \

services/audiopolicy/engineconfigurable/wrapper/Android.mk

+3 −1
Original line number Original line Diff line number Diff line
@@ -8,7 +8,6 @@ include $(CLEAR_VARS) 




LOCAL_C_INCLUDES := \

LOCAL_C_INCLUDES := \

    $(LOCAL_PATH)/include \

    $(LOCAL_PATH)/include \

    $(TARGET_OUT_HEADERS)/parameter \

    $(TOPDIR)frameworks/av/services/audiopolicy/engineconfigurable/include \

    $(TOPDIR)frameworks/av/services/audiopolicy/engineconfigurable/include \

    $(TOPDIR)frameworks/av/services/audiopolicy/engineconfigurable/interface \

    $(TOPDIR)frameworks/av/services/audiopolicy/engineconfigurable/interface \

    $(TOPDIR)frameworks/av/services/audiopolicy/utilities/convert \

    $(TOPDIR)frameworks/av/services/audiopolicy/utilities/convert \
@@ -18,6 +17,9 @@ LOCAL_SRC_FILES:= ParameterManagerWrapper.cpp 
LOCAL_STATIC_LIBRARIES := \

LOCAL_STATIC_LIBRARIES := \

    libmedia_helper \

    libmedia_helper \





LOCAL_SHARED_LIBRARIES := \

    libparameter \



LOCAL_MULTILIB := $(AUDIOSERVER_MULTILIB)

LOCAL_MULTILIB := $(AUDIOSERVER_MULTILIB)





LOCAL_MODULE:= libaudiopolicypfwwrapper

LOCAL_MODULE:= libaudiopolicypfwwrapper