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

Commit ddfa210b authored by Kevin Rocard's avatar Kevin Rocard Committed by android-build-merger
Browse files

libaudioHAL: reduce version specific code 

am: 00538f18

Change-Id: If2e33db3f2791fc5a90e7ee12877e21e4f25b7a0
parents 182ee543 00538f18

media/libaudiohal/Android.bp

+2 −7
Original line number Diff line number Diff line
@@ -13,12 +13,6 @@ cc_library_shared { 
    ],



    shared_libs: [

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

        "android.hardware.audio.effect@4.0",

        "android.hardware.audio.effect@5.0",

        "android.hardware.audio@2.0",

        "android.hardware.audio@4.0",

        "android.hardware.audio@5.0",

        "libaudiohal@2.0",

        "libaudiohal@4.0",

        "libaudiohal@5.0",
@@ -26,7 +20,8 @@ cc_library_shared { 
    ],



    header_libs: [

        "libaudiohal_headers"

        "libaudiohal_headers",

        "libbase_headers",

    ]

}

media/libaudiohal/DevicesFactoryHalInterface.cpp

+2 −4
Original line number Diff line number Diff line
@@ -22,10 +22,8 @@ namespace android { 


// static

sp<DevicesFactoryHalInterface> DevicesFactoryHalInterface::create() {

    return V5_0::createDevicesFactoryHal() ?:

           V4_0::createDevicesFactoryHal() ?:

           V2_0::createDevicesFactoryHal() ?:

           nullptr;

    return createPreferedImpl<DevicesFactoryHalInterface>();

}



} // namespace android

media/libaudiohal/EffectsFactoryHalInterface.cpp

+4 −9
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2016 The Android Open Source Project

 * 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.
@@ -14,20 +14,15 @@ 
 * limitations under the License.

 */



#include <android/hardware/audio/effect/2.0/IEffectsFactory.h>

#include <android/hardware/audio/effect/4.0/IEffectsFactory.h>

#include <android/hardware/audio/effect/5.0/IEffectsFactory.h>



#include <libaudiohal/FactoryHalHidl.h>



#include <media/audiohal/EffectsFactoryHalInterface.h>



namespace android {



// static

sp<EffectsFactoryHalInterface> EffectsFactoryHalInterface::create() {

    return effect::V5_0::createEffectsFactoryHal() ?:

           effect::V4_0::createEffectsFactoryHal() ?:

           effect::V2_0::createEffectsFactoryHal() ?:

           nullptr;

    return createPreferedImpl<EffectsFactoryHalInterface>();

}



// static

media/libaudiohal/impl/DevicesFactoryHalHybrid.cpp

+9 −2
Original line number Diff line number Diff line
@@ -17,9 +17,10 @@ 
#define LOG_TAG "DevicesFactoryHalHybrid"

//#define LOG_NDEBUG 0



#include "DevicesFactoryHalHidl.h"

#include "DevicesFactoryHalHybrid.h"

#include "DevicesFactoryHalLocal.h"

#include "DevicesFactoryHalHidl.h"

#include <libaudiohal/FactoryHalHidl.h>



namespace android {

namespace CPP_VERSION {
@@ -36,6 +37,12 @@ status_t DevicesFactoryHalHybrid::openDevice(const char *name, sp<DeviceHalInter 
    }

    return mLocalFactory->openDevice(name, device);

}



} // namespace CPP_VERSION



template <>

sp<DevicesFactoryHalInterface> createFactoryHal<AudioHALVersion::CPP_VERSION>() {

    auto service = hardware::audio::CPP_VERSION::IDevicesFactory::getService();

    return service ? new CPP_VERSION::DevicesFactoryHalHybrid(service) : nullptr;

}



} // namespace android

media/libaudiohal/impl/DevicesFactoryHalHybrid.h

+0 −5
Original line number Diff line number Diff line
@@ -41,11 +41,6 @@ class DevicesFactoryHalHybrid : public DevicesFactoryHalInterface 
    sp<DevicesFactoryHalInterface> mHidlFactory;

};



sp<DevicesFactoryHalInterface> createDevicesFactoryHal() {

    auto service = IDevicesFactory::getService();

    return service ? new DevicesFactoryHalHybrid(service) : nullptr;

}



} // namespace CPP_VERSION

} // namespace android