Revert "Audio V4: Split system and vendor Audio.h"
This reverts commit f8ad7f85e9891b2614338330c75ae9e946fccc5a.
Reason for revert: Breaks the build of multiple devices
Change-Id: I24f17a0fa0c7ba171c4a3639f890e7f4e42f6b1e
diff --git a/media/libaudiohal/2.0/Android.bp b/media/libaudiohal/2.0/Android.bp
index 0ab8981..574b435 100644
--- a/media/libaudiohal/2.0/Android.bp
+++ b/media/libaudiohal/2.0/Android.bp
@@ -6,6 +6,7 @@
"DevicesFactoryHalHybrid.cpp",
"DevicesFactoryHalLocal.cpp",
"StreamHalLocal.cpp",
+
"ConversionHelperHidl.cpp",
"DeviceHalHidl.cpp",
"DevicesFactoryHalHidl.cpp",
@@ -13,7 +14,6 @@
"EffectHalHidl.cpp",
"EffectsFactoryHalHidl.cpp",
"StreamHalHidl.cpp",
- "HidlUtils.cpp",
],
export_include_dirs: ["."],
@@ -24,7 +24,7 @@
],
shared_libs: [
"libaudiohal_deathhandler",
- "libaudioutils_system",
+ "libaudioutils",
"libcutils",
"liblog",
"libutils",
@@ -37,6 +37,7 @@
"libhidltransport",
"android.hardware.audio@2.0",
"android.hardware.audio.common@2.0",
+ "android.hardware.audio.common@2.0-util",
"android.hardware.audio.effect@2.0",
"android.hidl.allocator@1.0",
"android.hidl.memory@1.0",
@@ -44,8 +45,7 @@
"libmediautils",
],
header_libs: [
- "libaudiohal_headers",
- "libaudiohal_util",
+ "libaudiohal_headers"
],
export_shared_lib_headers: [
diff --git a/media/libaudiohal/2.0/EffectHalHidl.cpp b/media/libaudiohal/2.0/EffectHalHidl.cpp
index 87b1b41..4fb032c 100644
--- a/media/libaudiohal/2.0/EffectHalHidl.cpp
+++ b/media/libaudiohal/2.0/EffectHalHidl.cpp
@@ -18,6 +18,7 @@
//#define LOG_NDEBUG 0
#include <hwbinder/IPCThreadState.h>
+#include <media/EffectsFactoryApi.h>
#include <utils/Log.h>
#include "ConversionHelperHidl.h"
diff --git a/media/libaudiohal/2.0/HidlUtils.cpp b/media/libaudiohal/2.0/HidlUtils.cpp
deleted file mode 100644
index 228503f..0000000
--- a/media/libaudiohal/2.0/HidlUtils.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright (C) 2016 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 <util/HidlUtils.impl.h>
-#undef AUDIO_HAL_VERSION
diff --git a/media/libaudiohal/2.0/HidlUtils.h b/media/libaudiohal/2.0/HidlUtils.h
deleted file mode 100644
index 588b4dc..0000000
--- a/media/libaudiohal/2.0/HidlUtils.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (C) 2016 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.
- */
-
-#ifndef android_hardware_audio_V2_0_Hidl_Utils_H_
-#define android_hardware_audio_V2_0_Hidl_Utils_H_
-
-#include <android/hardware/audio/common/2.0/types.h>
-
-#define AUDIO_HAL_VERSION V2_0
-#include <util/HidlUtils.h>
-#undef AUDIO_HAL_VERSION
-
-#endif // android_hardware_audio_V2_0_Hidl_Utils_H_