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

Commit 1e4d737f authored by Eric Laurent's avatar Eric Laurent Committed by Android (Google) Code Review
Browse files

Merge changes from topic 'sound_trigger_hidl'

* changes:
  audioserver: restart audio hal service on restart
  Add support for treble sound trigger HAL
parents e812b7c1 f7854d45
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -5,3 +5,4 @@ service audioserver /system/bin/audioserver
    group audio camera drmrpc inet media mediadrm net_bt net_bt_admin net_bw_acct
    ioprio rt 4
    writepid /dev/cpuset/foreground/tasks /dev/stune/foreground/tasks
    onrestart restart audio-hal-2-0
 No newline at end of file
+21 −2
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ LOCAL_PATH:= $(call my-dir)

include $(CLEAR_VARS)


ifeq ($(SOUND_TRIGGER_USE_STUB_MODULE), 1)
    LOCAL_CFLAGS += -DSOUND_TRIGGER_USE_STUB_MODULE
endif
@@ -35,12 +34,32 @@ LOCAL_SHARED_LIBRARIES:= \
    libmedia \
    libserviceutility


ifeq ($(ENABLE_TREBLE),true)
# Treble configuration
LOCAL_CFLAGS += -DENABLE_TREBLE
LOCAL_SRC_FILES +=               \
    SoundTriggerHalHidl.cpp

LOCAL_SHARED_LIBRARIES += \
		libhwbinder \
		libhidl \
		libbase \
		android.hardware.soundtrigger@2.0 \
		android.hardware.audio.common@2.0
else
# libhardware configuration
LOCAL_SRC_FILES +=               \
    SoundTriggerHalLegacy.cpp
endif


LOCAL_C_INCLUDES += \
    $(TOPDIR)frameworks/av/services/audioflinger

LOCAL_MULTILIB := $(AUDIOSERVER_MULTILIB)

LOCAL_CFLAGS := -Wall -Werror
LOCAL_CFLAGS += -Wall -Werror

LOCAL_MODULE:= libsoundtriggerservice

+628 −0

File added.

Preview size limit exceeded, changes collapsed.

+167 −0

File added.

Preview size limit exceeded, changes collapsed.

+80 −0

File added.

Preview size limit exceeded, changes collapsed.

Loading