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

Commit 95213bf7 authored by Kevin Rocard's avatar Kevin Rocard
Browse files

libaudiohal: Factorize more between version 



Use macro in include to avoid duplicating all the headers.
That will be useful when a third version is added.

Bug: 118203066
Test: compile
Change-Id: I8972b9ac9d098b32c9e7de48ff0544440c29adbf
Signed-off-by: default avatarKevin Rocard <krocard@google.com>
parent 4183d37f

media/libaudiohal/impl/ConversionHelperHidl.h

+1 −2
Original line number Diff line number Diff line
@@ -17,8 +17,7 @@ 
#ifndef ANDROID_HARDWARE_CONVERSION_HELPER_HIDL_H

#define ANDROID_HARDWARE_CONVERSION_HELPER_HIDL_H



#include <android/hardware/audio/2.0/types.h>

#include <android/hardware/audio/4.0/types.h>

#include PATH(android/hardware/audio/FILE_VERSION/types.h)

#include <hidl/HidlSupport.h>

#include <system/audio.h>

#include <utils/String8.h>

media/libaudiohal/impl/DeviceHalHidl.cpp

+1 −2
Original line number Diff line number Diff line
@@ -19,8 +19,7 @@ 
#define LOG_TAG "DeviceHalHidl"

//#define LOG_NDEBUG 0



#include <android/hardware/audio/2.0/IPrimaryDevice.h>

#include <android/hardware/audio/4.0/IPrimaryDevice.h>

#include PATH(android/hardware/audio/FILE_VERSION/IPrimaryDevice.h)

#include <cutils/native_handle.h>

#include <hwbinder/IPCThreadState.h>

#include <utils/Log.h>

media/libaudiohal/impl/DeviceHalHidl.h

+2 −4
Original line number Diff line number Diff line
@@ -17,10 +17,8 @@ 
#ifndef ANDROID_HARDWARE_DEVICE_HAL_HIDL_H

#define ANDROID_HARDWARE_DEVICE_HAL_HIDL_H



#include <android/hardware/audio/2.0/IDevice.h>

#include <android/hardware/audio/4.0/IDevice.h>

#include <android/hardware/audio/2.0/IPrimaryDevice.h>

#include <android/hardware/audio/4.0/IPrimaryDevice.h>

#include PATH(android/hardware/audio/FILE_VERSION/IDevice.h)

#include PATH(android/hardware/audio/FILE_VERSION/IPrimaryDevice.h)

#include <media/audiohal/DeviceHalInterface.h>



#include "ConversionHelperHidl.h"

media/libaudiohal/impl/DevicesFactoryHalHidl.cpp

+1 −2
Original line number Diff line number Diff line
@@ -20,8 +20,7 @@ 
#define LOG_TAG "DevicesFactoryHalHidl"

//#define LOG_NDEBUG 0



#include <android/hardware/audio/2.0/IDevice.h>

#include <android/hardware/audio/4.0/IDevice.h>

#include PATH(android/hardware/audio/FILE_VERSION/IDevice.h)

#include <media/audiohal/hidl/HalDeathHandler.h>

#include <utils/Log.h>

media/libaudiohal/impl/DevicesFactoryHalHidl.h

+1 −2
Original line number Diff line number Diff line
@@ -17,8 +17,7 @@ 
#ifndef ANDROID_HARDWARE_DEVICES_FACTORY_HAL_HIDL_H

#define ANDROID_HARDWARE_DEVICES_FACTORY_HAL_HIDL_H



#include <android/hardware/audio/2.0/IDevicesFactory.h>

#include <android/hardware/audio/4.0/IDevicesFactory.h>

#include PATH(android/hardware/audio/FILE_VERSION/IDevicesFactory.h)

#include <media/audiohal/DevicesFactoryHalInterface.h>

#include <utils/Errors.h>

#include <utils/RefBase.h>