commit dcd740533ffb6cdc7a9f6014e29ea0e12caebd68
author Andy Hung <hunga@google.com> Thu Jun 15 18:52:23 2023 -0700
committer Andy Hung <hunga@google.com> Fri Jun 16 11:03:05 2023 -0700
tree af63e24fe5c43430f9095999f112b63ffed657f3
parent 8c2636fa7e897a537afed6a6fccf8e657464dd43

AudioFlinger: Move small files to afutils

Test: ALLOW_LOCAL_TIDY_TRUE=1 mm -j .
Bug: 287549635
Change-Id: I148097b7ed8091d549d1cf541105c31bceb7450f

services/audioflinger/Android.bp

diff --git a/services/audioflinger/Android.bp b/services/audioflinger/Android.bp
index 9708ba2..6329bae 100644
--- a/services/audioflinger/Android.bp
+++ b/services/audioflinger/Android.bp
@@ -201,7 +201,6 @@
         "MelReporter.cpp",
         "PatchCommandThread.cpp",
         "PatchPanel.cpp",
-        "PropertyUtils.cpp",
         "Threads.cpp",
         "Tracks.cpp",
     ],

services/audioflinger/AudioFlinger.cpp

diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp
index 6406c6f..60717b5 100644
--- a/services/audioflinger/AudioFlinger.cpp
+++ b/services/audioflinger/AudioFlinger.cpp
@@ -59,7 +59,7 @@
 
 #include "AudioFlinger.h"
 #include "EffectConfiguration.h"
-#include "PropertyUtils.h"
+#include <afutils/PropertyUtils.h>
 
 #include <media/AudioResamplerPublic.h>
 

services/audioflinger/AudioFlinger.h

diff --git a/services/audioflinger/AudioFlinger.h b/services/audioflinger/AudioFlinger.h
index 320975e..8b1d70b 100644
--- a/services/audioflinger/AudioFlinger.h
+++ b/services/audioflinger/AudioFlinger.h
@@ -79,6 +79,7 @@
 #include <mediautils/Synchronization.h>
 #include <mediautils/ThreadSnapshot.h>
 
+#include <afutils/AllocatorFactory.h>
 #include <afutils/AudioWatchdog.h>
 #include <afutils/NBAIO_Tee.h>
 
@@ -104,7 +105,6 @@
 #include <fastpath/FastMixer.h>
 #include <media/nbaio/NBAIO.h>
 
-#include "AllocatorFactory.h"
 #include <android/os/IPowerManager.h>
 
 #include <media/nblog/NBLog.h>

services/audioflinger/afutils/AllocatorFactory.h

diff --git a/services/audioflinger/AllocatorFactory.h b/services/audioflinger/afutils/AllocatorFactory.h
similarity index 100%
rename from services/audioflinger/AllocatorFactory.h
rename to services/audioflinger/afutils/AllocatorFactory.h

services/audioflinger/afutils/Android.bp

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
     ],

services/audioflinger/afutils/PropertyUtils.cpp

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

services/audioflinger/afutils/PropertyUtils.h

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