Add libaudioclient_headers
Test: works with BOARD_VNDK_VERSION := current
Bug: 33241851
Change-Id: I31cf7e7cd89fe6e71d4e52f7682990146a12b2fb
diff --git a/media/libaudioclient/Android.bp b/media/libaudioclient/Android.bp
index ad130e0..166534f 100644
--- a/media/libaudioclient/Android.bp
+++ b/media/libaudioclient/Android.bp
@@ -1,3 +1,9 @@
+cc_library_headers {
+ name: "libaudioclient_headers",
+ vendor_available: true,
+ export_include_dirs: ["include"],
+}
+
cc_library_shared {
name: "libaudioclient",
srcs: [
@@ -26,17 +32,20 @@
"libaudioutils",
],
export_shared_lib_headers: ["libbinder"],
- local_include_dirs: ["include"],
- export_include_dirs: ["include"],
+
+ local_include_dirs: ["include/media"],
+ header_libs: ["libaudioclient_headers"],
+ export_header_lib_headers: ["libaudioclient_headers"],
+
// for memory heap analysis
static_libs: [
"libc_malloc_debug_backtrace",
"libc_logging",
],
cflags: [
+ "-Wall",
"-Werror",
"-Wno-error=deprecated-declarations",
- "-Wall",
],
sanitize: {
misc_undefined : [
diff --git a/media/libaudioclient/IAudioFlinger.cpp b/media/libaudioclient/IAudioFlinger.cpp
index 4e2a0d5..858b5cc 100644
--- a/media/libaudioclient/IAudioFlinger.cpp
+++ b/media/libaudioclient/IAudioFlinger.cpp
@@ -24,7 +24,7 @@
#include <binder/Parcel.h>
-#include <media/IAudioFlinger.h>
+#include "IAudioFlinger.h"
namespace android {
diff --git a/media/libaudioclient/include/AudioBufferProvider.h b/media/libaudioclient/include/media/AudioBufferProvider.h
similarity index 100%
rename from media/libaudioclient/include/AudioBufferProvider.h
rename to media/libaudioclient/include/media/AudioBufferProvider.h
diff --git a/media/libaudioclient/include/AudioEffect.h b/media/libaudioclient/include/media/AudioEffect.h
similarity index 100%
rename from media/libaudioclient/include/AudioEffect.h
rename to media/libaudioclient/include/media/AudioEffect.h
diff --git a/media/libaudioclient/include/AudioIoDescriptor.h b/media/libaudioclient/include/media/AudioIoDescriptor.h
similarity index 100%
rename from media/libaudioclient/include/AudioIoDescriptor.h
rename to media/libaudioclient/include/media/AudioIoDescriptor.h
diff --git a/media/libaudioclient/include/AudioMixer.h b/media/libaudioclient/include/media/AudioMixer.h
similarity index 100%
rename from media/libaudioclient/include/AudioMixer.h
rename to media/libaudioclient/include/media/AudioMixer.h
diff --git a/media/libaudioclient/include/AudioParameter.h b/media/libaudioclient/include/media/AudioParameter.h
similarity index 100%
rename from media/libaudioclient/include/AudioParameter.h
rename to media/libaudioclient/include/media/AudioParameter.h
diff --git a/media/libaudioclient/include/AudioPolicy.h b/media/libaudioclient/include/media/AudioPolicy.h
similarity index 100%
rename from media/libaudioclient/include/AudioPolicy.h
rename to media/libaudioclient/include/media/AudioPolicy.h
diff --git a/media/libaudioclient/include/AudioPolicyHelper.h b/media/libaudioclient/include/media/AudioPolicyHelper.h
similarity index 96%
rename from media/libaudioclient/include/AudioPolicyHelper.h
rename to media/libaudioclient/include/media/AudioPolicyHelper.h
index 04f6a20..854057d 100644
--- a/media/libaudioclient/include/AudioPolicyHelper.h
+++ b/media/libaudioclient/include/media/AudioPolicyHelper.h
@@ -18,6 +18,8 @@
#include <system/audio.h>
+// TODO: fix this among dependencies
+__attribute__((unused))
static audio_stream_type_t audio_attributes_to_stream_type(const audio_attributes_t *attr)
{
// flags to stream type mapping
@@ -63,6 +65,8 @@
}
}
+// TODO: fix this among dependencies
+__attribute__((unused))
static void stream_type_to_audio_attributes(audio_stream_type_t streamType,
audio_attributes_t *attr) {
memset(attr, 0, sizeof(audio_attributes_t));
diff --git a/media/libaudioclient/include/AudioRecord.h b/media/libaudioclient/include/media/AudioRecord.h
similarity index 100%
rename from media/libaudioclient/include/AudioRecord.h
rename to media/libaudioclient/include/media/AudioRecord.h
diff --git a/media/libaudioclient/include/AudioSystem.h b/media/libaudioclient/include/media/AudioSystem.h
similarity index 100%
rename from media/libaudioclient/include/AudioSystem.h
rename to media/libaudioclient/include/media/AudioSystem.h
diff --git a/media/libaudioclient/include/AudioTimestamp.h b/media/libaudioclient/include/media/AudioTimestamp.h
similarity index 100%
rename from media/libaudioclient/include/AudioTimestamp.h
rename to media/libaudioclient/include/media/AudioTimestamp.h
diff --git a/media/libaudioclient/include/AudioTrack.h b/media/libaudioclient/include/media/AudioTrack.h
similarity index 100%
rename from media/libaudioclient/include/AudioTrack.h
rename to media/libaudioclient/include/media/AudioTrack.h
diff --git a/media/libaudioclient/include/IAudioFlinger.h b/media/libaudioclient/include/media/IAudioFlinger.h
similarity index 98%
rename from media/libaudioclient/include/IAudioFlinger.h
rename to media/libaudioclient/include/media/IAudioFlinger.h
index 8c5e61a..0ad4231 100644
--- a/media/libaudioclient/include/IAudioFlinger.h
+++ b/media/libaudioclient/include/media/IAudioFlinger.h
@@ -259,6 +259,9 @@
const Parcel& data,
Parcel* reply,
uint32_t flags = 0);
+
+ // Requests media.log to start merging log buffers
+ virtual void requestLogMerge() = 0;
};
// ----------------------------------------------------------------------------
diff --git a/media/libaudioclient/include/IAudioFlingerClient.h b/media/libaudioclient/include/media/IAudioFlingerClient.h
similarity index 100%
rename from media/libaudioclient/include/IAudioFlingerClient.h
rename to media/libaudioclient/include/media/IAudioFlingerClient.h
diff --git a/media/libaudioclient/include/IAudioPolicyService.h b/media/libaudioclient/include/media/IAudioPolicyService.h
similarity index 100%
rename from media/libaudioclient/include/IAudioPolicyService.h
rename to media/libaudioclient/include/media/IAudioPolicyService.h
diff --git a/media/libaudioclient/include/IAudioPolicyServiceClient.h b/media/libaudioclient/include/media/IAudioPolicyServiceClient.h
similarity index 100%
rename from media/libaudioclient/include/IAudioPolicyServiceClient.h
rename to media/libaudioclient/include/media/IAudioPolicyServiceClient.h
diff --git a/media/libaudioclient/include/IAudioRecord.h b/media/libaudioclient/include/media/IAudioRecord.h
similarity index 100%
rename from media/libaudioclient/include/IAudioRecord.h
rename to media/libaudioclient/include/media/IAudioRecord.h
diff --git a/media/libaudioclient/include/IAudioTrack.h b/media/libaudioclient/include/media/IAudioTrack.h
similarity index 100%
rename from media/libaudioclient/include/IAudioTrack.h
rename to media/libaudioclient/include/media/IAudioTrack.h
diff --git a/media/libaudioclient/include/IEffect.h b/media/libaudioclient/include/media/IEffect.h
similarity index 100%
rename from media/libaudioclient/include/IEffect.h
rename to media/libaudioclient/include/media/IEffect.h
diff --git a/media/libaudioclient/include/IEffectClient.h b/media/libaudioclient/include/media/IEffectClient.h
similarity index 100%
rename from media/libaudioclient/include/IEffectClient.h
rename to media/libaudioclient/include/media/IEffectClient.h
diff --git a/media/libaudioclient/include/ToneGenerator.h b/media/libaudioclient/include/media/ToneGenerator.h
similarity index 100%
rename from media/libaudioclient/include/ToneGenerator.h
rename to media/libaudioclient/include/media/ToneGenerator.h