Merge "AudioFlinger: Move small files to afutils"
diff --git a/services/audioflinger/Android.bp b/services/audioflinger/Android.bp
index 73c2ff4..85746f3 100644
--- a/services/audioflinger/Android.bp
+++ b/services/audioflinger/Android.bp
@@ -151,7 +151,6 @@
"DeviceEffectManager.cpp",
"Effects.cpp",
"PatchPanel.cpp",
- "PropertyUtils.cpp",
"Threads.cpp",
"Tracks.cpp",
],
diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp
index 926110882..dd84bd5 100644
--- a/services/audioflinger/AudioFlinger.cpp
+++ b/services/audioflinger/AudioFlinger.cpp
@@ -58,7 +58,7 @@
#include <audiomanager/AudioManager.h>
#include "AudioFlinger.h"
-#include "PropertyUtils.h"
+#include <afutils/PropertyUtils.h>
#include <media/AudioResamplerPublic.h>
diff --git a/services/audioflinger/afutils/Android.bp b/services/audioflinger/afutils/Android.bp
index 4c03e07..1580b8f 100644
--- a/services/audioflinger/afutils/Android.bp
+++ b/services/audioflinger/afutils/Android.bp
@@ -32,18 +32,21 @@
defaults: [
"audioflinger_utils_flags_defaults",
+ "latest_android_media_audio_common_types_cpp_shared", // PropertyUtils.cpp
],
srcs: [
"AudioWatchdog.cpp",
"BufLog.cpp",
"NBAIO_Tee.cpp",
+ "PropertyUtils.cpp",
"TypedLogger.cpp",
],
shared_libs: [
"libaudioutils",
"libbase",
+ "libcutils", // property_get_int32
"liblog",
"libnbaio",
"libnblog",
@@ -54,6 +57,10 @@
"libsndfile",
],
+ header_libs: [
+ "libaaudio_headers", // PropertyUtils.cpp
+ ],
+
include_dirs: [
"frameworks/av/services/audioflinger", // for configuration
],
diff --git a/services/audioflinger/PropertyUtils.cpp b/services/audioflinger/afutils/PropertyUtils.cpp
similarity index 100%
rename from services/audioflinger/PropertyUtils.cpp
rename to services/audioflinger/afutils/PropertyUtils.cpp
diff --git a/services/audioflinger/PropertyUtils.h b/services/audioflinger/afutils/PropertyUtils.h
similarity index 100%
rename from services/audioflinger/PropertyUtils.h
rename to services/audioflinger/afutils/PropertyUtils.h