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/EffectsFactoryHalHidl.cpp

diff --git a/media/libaudiohal/4.0/EffectsFactoryHalHidl.cpp b/media/libaudiohal/4.0/EffectsFactoryHalHidl.cpp
index 0d40e6d..301175e 100644
--- a/media/libaudiohal/4.0/EffectsFactoryHalHidl.cpp
+++ b/media/libaudiohal/4.0/EffectsFactoryHalHidl.cpp
@@ -25,13 +25,14 @@
 #include "EffectsFactoryHalHidl.h"
 #include "HidlUtils.h"
 
-using ::android::hardware::audio::common::V2_0::HidlUtils;
-using ::android::hardware::audio::common::V2_0::Uuid;
-using ::android::hardware::audio::effect::V2_0::IEffect;
-using ::android::hardware::audio::effect::V2_0::Result;
+using ::android::hardware::audio::common::V4_0::HidlUtils;
+using ::android::hardware::audio::common::V4_0::Uuid;
+using ::android::hardware::audio::effect::V4_0::IEffect;
+using ::android::hardware::audio::effect::V4_0::Result;
 using ::android::hardware::Return;
 
 namespace android {
+namespace V4_0 {
 
 EffectsFactoryHalHidl::EffectsFactoryHalHidl() : ConversionHelperHidl("EffectsFactory") {
     mEffectsFactory = IEffectsFactory::getService();
@@ -147,4 +148,5 @@
 }
 
 
+} // namespace V4_0
 } // namespace android