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

Commit cb9827c0 authored by Kevin Rocard's avatar Kevin Rocard
Browse files

Audio V4: Transition legacy wrapper to Android.bp 



Bug: 38184704
Test: compile
Change-Id: I950b3c38e1ae8093414ce1054a8530047a81ccca
Signed-off-by: default avatarKevin Rocard <krocard@google.com>
parent 1ae04011

audio/2.0/default/Android.bp

0 → 100644
+45 −0
Original line number Diff line number Diff line 
cc_library_shared {

    name: "android.hardware.audio@2.0-impl",

    relative_install_path: "hw",

    proprietary: true,

    vendor: true,

    srcs: [

        "Conversions.cpp",

        "Device.cpp",

        "DevicesFactory.cpp",

        "ParametersUtil.cpp",

        "PrimaryDevice.cpp",

        "Stream.cpp",

        "StreamIn.cpp",

        "StreamOut.cpp",

    ],



    defaults: ["hidl_defaults"],



    shared_libs: [

        "libbase",

        "libcutils",

        "libfmq",

        "libhardware",

        "libhidlbase",

        "libhidltransport",

        "liblog",

        "libutils",

        "android.hardware.audio@2.0",

        "android.hardware.audio.common@2.0",

        "android.hardware.audio.common@2.0-util",

        "android.hardware.audio.common-util",

    ],



    header_libs: [

        "libaudioclient_headers",

        "libaudio_system_headers",

        "libhardware_headers",

        "libmedia_headers",

    ],



    whole_static_libs: [

        "libmedia_helper",

    ],



}

audio/2.0/default/Android.mk

+2 −40
Original line number Diff line number Diff line
@@ -16,46 +16,6 @@ 


LOCAL_PATH := $(call my-dir)



include $(CLEAR_VARS)

LOCAL_MODULE := android.hardware.audio@2.0-impl

LOCAL_MODULE_RELATIVE_PATH := hw

LOCAL_PROPRIETARY_MODULE := true

LOCAL_SRC_FILES := \

    Conversions.cpp \

    Device.cpp \

    DevicesFactory.cpp \

    ParametersUtil.cpp \

    PrimaryDevice.cpp \

    Stream.cpp \

    StreamIn.cpp \

    StreamOut.cpp \



LOCAL_CFLAGS := -Wall -Werror



LOCAL_SHARED_LIBRARIES := \

    libbase \

    libcutils \

    libfmq \

    libhardware \

    libhidlbase \

    libhidltransport \

    liblog \

    libutils \

    android.hardware.audio@2.0 \

    android.hardware.audio.common@2.0 \

    android.hardware.audio.common@2.0-util \

    android.hardware.audio.common-util \



LOCAL_HEADER_LIBRARIES := \

    libaudioclient_headers \

    libaudio_system_headers \

    libhardware_headers \

    libmedia_headers \



LOCAL_WHOLE_STATIC_LIBRARIES := libmedia_helper



include $(BUILD_SHARED_LIBRARY)



#

# Service

#
@@ -83,6 +43,8 @@ LOCAL_SHARED_LIBRARIES := \ 
    android.hardware.broadcastradio@1.0 \

    android.hardware.broadcastradio@1.1



# Can not switch to Android.bp until AUDIOSERVER_MULTILIB

# is deprecated as build config variable are not supported

ifeq ($(strip $(AUDIOSERVER_MULTILIB)),)

LOCAL_MULTILIB := 32

else