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

Commit 7dc7f415 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "qahw: Add binder support for Audio HAL"

parents 95eb928b 404f26d1
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ include $(MY_LOCAL_PATH)/voice_processing/Android.mk
include $(MY_LOCAL_PATH)/mm-audio/Android.mk
include $(MY_LOCAL_PATH)/visualizer/Android.mk
include $(MY_LOCAL_PATH)/post_proc/Android.mk
include $(MY_LOCAL_PATH)/qahw/Android.mk
include $(MY_LOCAL_PATH)/qahw_api/Android.mk
endif

+1 −0
Original line number Diff line number Diff line
@@ -75,6 +75,7 @@ if (test x$TARGET_SUPPORT = xapq8098); then
fi
AC_SUBST([TARGET_CFLAGS])

AM_CONDITIONAL([QTI_AUDIO_SERVER_ENABLED],[test x$BOARD_SUPPORTS_QTI_AUDIO_SERVER = xtrue])
AM_CONDITIONAL([QAHW_SUPPORT], [test x$BOARD_SUPPORTS_QAHW = xtrue])
AM_CONDITIONAL([HDMI_EDID],    [test x$AUDIO_FEATURE_ENABLED_HDMI_EDID = xtrue])
AM_CONDITIONAL([FM_POWER_OPT], [test x$AUDIO_FEATURE_ENABLED_FM_POWER_OPT = xtrue])

qahw/Android.mk

0 → 100644
+38 −0
Original line number Diff line number Diff line
ifeq ($(strip $(BOARD_SUPPORTS_QAHW)),true)

LOCAL_PATH := $(call my-dir)

include $(CLEAR_VARS)

libqahw-inc := $(LOCAL_PATH)/inc

LOCAL_MODULE := libqahwwrapper
LOCAL_MODULE_TAGS := optional
LOCAL_C_INCLUDES   := $(libqahw-inc)

LOCAL_SRC_FILES := \
    src/qahw.c \
    src/qahw_effect.c

LOCAL_SHARED_LIBRARIES := \
    liblog \
    libcutils \
    libhardware \
    libdl

LOCAL_CFLAGS += -Wall -Werror

LOCAL_COPY_HEADERS_TO   := mm-audio/qahw/inc
LOCAL_COPY_HEADERS      := inc/qahw.h
LOCAL_COPY_HEADERS      += inc/qahw_effect_api.h

LOCAL_PRELINK_MODULE    := false

include $(BUILD_SHARED_LIBRARY)

include $(CLEAR_VARS)
LOCAL_COPY_HEADERS_TO   := mm-audio/qahw_api/inc
LOCAL_COPY_HEADERS      := inc/qahw_defs.h

include $(BUILD_COPY_HEADERS)
endif

qahw/Makefile.am

0 → 100644
+20 −0
Original line number Diff line number Diff line
AM_CFLAGS = -I $(top_srcdir)/inc

h_sources = inc/qahw.h \
            inc/qahw_effect_api.h

qahw_include_HEADERS = $(h_sources)
qahw_includedir = $(includedir)/mm-audio/qahw/inc

qahw_api_include_HEADERS = inc/qahw_defs.h
qahw_api_includedir = $(includedir)/mm-audio/qahw_api/inc

lib_LTLIBRARIES = libqahwwrapper.la
libqahwwrapper_la_SOURCES = src/qahw.c \
                     src/qahw_effect.c

libqahwwrapper_la_CFLAGS  = $(AM_CFLAGS)
libqahwwrapper_la_CFLAGS += -include stddef.h
libqahwwrapper_la_CFLAGS += -D__unused=__attribute__\(\(__unused__\)\)
libqahwwrapper_la_CFLAGS += -Werror
libqahwwrapper_la_LDFLAGS = -shared -avoid-version -llog -lcutils -lhardware

qahw/configure.ac

0 → 100644
+36 −0
Original line number Diff line number Diff line
#                                               -*- Autoconf -*-
# configure.ac -- Autoconf script for halinterface
#

# Process this file with autoconf to produce a configure script.

# Requires autoconf tool later than 2.61
AC_PREREQ([2.69])
# Initialize the audiohalwrapper-interface package version 1.0.0
AC_INIT(audiohalwrapperinterface,1.0.0)
# Does not strictly follow GNU Coding standards
AM_INIT_AUTOMAKE([foreign])
# Disables auto rebuilding of configure, Makefile.ins
#AM_MAINTAINER_MODE
# defines some macros variable to be included by source
AC_CONFIG_HEADERS([config.h])
# defines some macros variable to be included by source
AC_CONFIG_MACRO_DIR([m4])

# Checks for programs.
AC_PROG_CC
AM_PROG_CC_C_O
AC_PROG_CXX
AC_PROG_LIBTOOL
AC_PROG_AWK
AC_PROG_CPP
AC_PROG_INSTALL
AC_PROG_LN_S
AC_PROG_MAKE_SET
PKG_PROG_PKG_CONFIG

AC_CONFIG_FILES([ \
        Makefile
        ])

AC_OUTPUT
Loading