commit 2390b5d696471a655abd663fde3679d33412a093
author Kevin Rocard <krocard@google.com> Wed Feb 28 14:36:53 2018 -0800
committer Kevin Rocard <krocard@google.com> Thu Mar 01 22:21:32 2018 -0800
tree b4e7b5cf2e51325b5ae8e95f7c273d6fa996166e
parent d4de2889dbe297942fccb8816c7dfa4b9e8bb7fe

Audio V4: Update namespace and version of 4.0 shim

Put the shim in a V4_0 namespace to comply with the ODR.
Make the include guard unique.
Split from the error prone interface adaptation change for safer review.

Patch generated with:
sed -i 's/V2_0/V4_0/g' *
sed -i "/include.*2.0/s/2\.0/4.0/" *
sed -i '/namespace android *{/anamespace V4_0 {' *
sed -Ei 's/(ifndef|define|endif)(.*)_H/\1\2_4_0_H/' *
sed -Ei 's#}(.*)namespace android$#}\1namespace V4_0\n\0#' *

Bug: 38184704
Test: Compile
Change-Id: I7d3aa46b3dfec664cbeea8a6b946456b8e8f06e3
Signed-off-by: Kevin Rocard <krocard@google.com>

media/libaudiohal/4.0/DevicesFactoryHalHidl.cpp

diff --git a/media/libaudiohal/4.0/DevicesFactoryHalHidl.cpp b/media/libaudiohal/4.0/DevicesFactoryHalHidl.cpp
index 5b33592..5feed09 100644
--- a/media/libaudiohal/4.0/DevicesFactoryHalHidl.cpp
+++ b/media/libaudiohal/4.0/DevicesFactoryHalHidl.cpp
@@ -19,7 +19,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 <media/audiohal/hidl/HalDeathHandler.h>
 #include <utils/Log.h>
 
@@ -27,11 +27,12 @@
 #include "DeviceHalHidl.h"
 #include "DevicesFactoryHalHidl.h"
 
-using ::android::hardware::audio::V2_0::IDevice;
-using ::android::hardware::audio::V2_0::Result;
+using ::android::hardware::audio::V4_0::IDevice;
+using ::android::hardware::audio::V4_0::Result;
 using ::android::hardware::Return;
 
 namespace android {
+namespace V4_0 {
 
 DevicesFactoryHalHidl::DevicesFactoryHalHidl() {
     mDevicesFactory = IDevicesFactory::getService();
@@ -95,4 +96,5 @@
     return FAILED_TRANSACTION;
 }
 
+} // namespace V4_0
 } // namespace android