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

Commit 78c02ddb authored by Chong Zhang's avatar Chong Zhang Committed by Android Git Automerger
Browse files

am cfa5bf04: Merge "make libserviceutility a shared lib" into lmp-mr1-dev 

* commit 'cfa5bf04':
  make libserviceutility a shared lib
  audio policy: fix remote mic capture
  audio policy: suppport for dynamic source
  Fix overload of SoftVideoDecoderOMXComponent::updatePortDefinitions
  Fix race condition in signaling completion for decode.
  AnotherPacketSource: need reset some members before returning from queueDiscontinuity().
  Fix looping sound playback
  AnotherPacketSource.cpp: Do not queue discontinity signal buffer resulted from seek.
parents 6ab33981 cfa5bf04

services/audioflinger/Android.mk

+10 −4
Original line number Diff line number Diff line
@@ -19,7 +19,13 @@ LOCAL_SRC_FILES := \ 
# FIXME Move this library to frameworks/native

LOCAL_MODULE := libserviceutility



include $(BUILD_STATIC_LIBRARY)

LOCAL_SHARED_LIBRARIES := \

    libcutils \

    libutils \

    liblog \

    libbinder



include $(BUILD_SHARED_LIBRARY)



include $(CLEAR_VARS)
@@ -51,13 +57,13 @@ LOCAL_SHARED_LIBRARIES := \ 
    libhardware \

    libhardware_legacy \

    libeffects \

    libpowermanager

    libpowermanager \

    libserviceutility



LOCAL_STATIC_LIBRARIES := \

    libscheduling_policy \

    libcpustats \

    libmedia_helper \

    libserviceutility

    libmedia_helper



LOCAL_MODULE:= libaudioflinger

LOCAL_32_BIT_ONLY := true

services/audiopolicy/Android.mk

+3 −3
Original line number Diff line number Diff line
@@ -30,7 +30,8 @@ LOCAL_SHARED_LIBRARIES := \ 
    libbinder \

    libmedia \

    libhardware \

    libhardware_legacy

    libhardware_legacy \

    libserviceutility



ifneq ($(USE_LEGACY_AUDIO_POLICY), 1)

LOCAL_SHARED_LIBRARIES += \
@@ -38,8 +39,7 @@ LOCAL_SHARED_LIBRARIES += \ 
endif



LOCAL_STATIC_LIBRARIES := \

    libmedia_helper \

    libserviceutility

    libmedia_helper



LOCAL_MODULE:= libaudiopolicyservice

services/soundtrigger/Android.mk

+1 −3
Original line number Diff line number Diff line
@@ -32,9 +32,7 @@ LOCAL_SHARED_LIBRARIES:= \ 
    libcutils \

    libhardware \

    libsoundtrigger \

    libmedia



LOCAL_STATIC_LIBRARIES := \

    libmedia \

    libserviceutility



LOCAL_C_INCLUDES += \