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

Commit 6891d7ec authored by Kevin Rocard's avatar Kevin Rocard
Browse files

Audio V4: Make common helper version independent 



The implementation uses the version provided by macro.

Bug: 38184704
Test: compile
Change-Id: Ib5565bdf77ed9e42fc8271a4317eb88681aefcd5
Signed-off-by: default avatarKevin Rocard <krocard@google.com>
parent 649142be

audio/2.0/default/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ LOCAL_SHARED_LIBRARIES := \ 
    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 \

audio/2.0/default/Device.cpp

+2 −0
Original line number Diff line number Diff line
@@ -30,6 +30,8 @@ 
#include "StreamOut.h"

#include "Util.h"



using ::android::hardware::audio::common::V2_0::HidlUtils;



namespace android {

namespace hardware {

namespace audio {

audio/2.0/default/Stream.cpp

+1 −1
Original line number Diff line number Diff line
@@ -26,8 +26,8 @@ 
#include <utils/Vector.h>



#include "Conversions.h"

#include "EffectMap.h"

#include "Stream.h"

#include "common/all-versions/default/EffectMap.h"



namespace android {

namespace hardware {

audio/common/2.0/default/Android.bp

0 → 100644
+47 −0
Original line number Diff line number Diff line 
//

// Copyright (C) 2017 The Android Open Source Project

//

// Licensed under the Apache License, Version 2.0 (the "License");

// you may not use this file except in compliance with the License.

// You may obtain a copy of the License at

//

//      http://www.apache.org/licenses/LICENSE-2.0

//

// Unless required by applicable law or agreed to in writing, software

// distributed under the License is distributed on an "AS IS" BASIS,

// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

// See the License for the specific language governing permissions and

// limitations under the License.



cc_library_shared {

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

    defaults: ["hidl_defaults"],

    vendor_available: true,

    vndk: {

        enabled: true,

    },

    srcs: [

        "HidlUtils.cpp",

    ],



    export_include_dirs: ["."],



    static_libs: [

    ],



    shared_libs: [

        "liblog",

        "libutils",

        "libhidlbase",

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

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

    ],

    export_shared_lib_headers: [

        "android.hardware.audio.common-util"

    ],



    header_libs: [

        "libaudio_system_headers",

        "libhardware_headers",

    ],

}

audio/common/2.0/default/HidlUtils.cpp

0 → 100644
+21 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2017 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#include "HidlUtils.h"



#define AUDIO_HAL_VERSION V2_0

#include <common/all-versions/default/HidlUtils.impl.h>

#undef AUDIO_HAL_VERSION