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

Commit 1adf7f84 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 

am: 6371c436

Change-Id: Id6a027637ad27f7471b1aa07d6a788158549a8e3
parents 44a580a5 6371c436

services/audiopolicy/engineconfigurable/Android.mk

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



LOCAL_SHARED_LIBRARIES := \

    liblog \

    libcutils \

    libutils \

    liblog \

services/audiopolicy/engineconfigurable/wrapper/Android.mk

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


LOCAL_C_INCLUDES := \

    $(LOCAL_PATH)/include \

    $(TARGET_OUT_HEADERS)/parameter \

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

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

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


LOCAL_WHOLE_STATIC_LIBRARIES := libmedia_helper



LOCAL_SHARED_LIBRARIES := \

    libparameter \



LOCAL_MULTILIB := $(AUDIOSERVER_MULTILIB)



LOCAL_MODULE:= libaudiopolicypfwwrapper