From 8589ce7045fd4f5520aabbc773f00c7136925fd7 Mon Sep 17 00:00:00 2001 From: Glenn Kasten Date: Fri, 8 Sep 2017 17:03:42 -0700 Subject: [PATCH] Split nblog off from nbaio nbaio is an acronym for "non-blocking audio I/O", and nblog means "non-blocking logger" so nblog does not belong with nbaio. There are a lot of improvements planned for nblog, and having the restructuring done will make it clearer as more files are added. Test: builds OK Change-Id: Ib28bada2566c1d64bdbe9f5d7a5ce40e080178ef --- include/media/nbaio/NBLog.h | 1 - include/media/nbaio/PerformanceAnalysis.h | 1 - include/media/nbaio/ReportPerformance.h | 1 - include/media/nblog/NBLog.h | 1 + include/media/nblog/PerformanceAnalysis.h | 1 + include/media/nblog/ReportPerformance.h | 1 + .../libaudioclient/include/media/AudioMixer.h | 2 +- media/libaudioprocessing/Android.mk | 1 + media/libnbaio/Android.bp | 3 -- media/libnblog/Android.bp | 28 +++++++++++++++++++ media/{libnbaio => libnblog}/NBLog.cpp | 6 ++-- .../PerformanceAnalysis.cpp | 6 ++-- .../ReportPerformance.cpp | 6 ++-- .../include/media/nblog}/NBLog.h | 4 +-- .../media/nblog}/PerformanceAnalysis.h | 2 +- .../include/media/nblog}/ReportPerformance.h | 0 services/audioflinger/Android.mk | 1 + services/audioflinger/AudioFlinger.h | 2 +- services/audioflinger/FastMixerState.h | 2 +- services/audioflinger/FastThreadState.h | 2 +- services/audioflinger/TypedLogger.h | 4 ++- services/medialog/Android.mk | 2 +- services/medialog/MediaLogService.cpp | 2 +- services/medialog/MediaLogService.h | 2 +- 24 files changed, 55 insertions(+), 26 deletions(-) delete mode 120000 include/media/nbaio/NBLog.h delete mode 120000 include/media/nbaio/PerformanceAnalysis.h delete mode 120000 include/media/nbaio/ReportPerformance.h create mode 120000 include/media/nblog/NBLog.h create mode 120000 include/media/nblog/PerformanceAnalysis.h create mode 120000 include/media/nblog/ReportPerformance.h create mode 100644 media/libnblog/Android.bp rename media/{libnbaio => libnblog}/NBLog.cpp (99%) rename media/{libnbaio => libnblog}/PerformanceAnalysis.cpp (99%) rename media/{libnbaio => libnblog}/ReportPerformance.cpp (97%) rename media/{libnbaio/include/media/nbaio => libnblog/include/media/nblog}/NBLog.h (99%) rename media/{libnbaio/include/media/nbaio => libnblog/include/media/nblog}/PerformanceAnalysis.h (99%) rename media/{libnbaio/include/media/nbaio => libnblog/include/media/nblog}/ReportPerformance.h (100%) diff --git a/include/media/nbaio/NBLog.h b/include/media/nbaio/NBLog.h deleted file mode 120000 index c35401ea85..0000000000 --- a/include/media/nbaio/NBLog.h +++ /dev/null @@ -1 +0,0 @@ -../../../media/libnbaio/include/media/nbaio/NBLog.h \ No newline at end of file diff --git a/include/media/nbaio/PerformanceAnalysis.h b/include/media/nbaio/PerformanceAnalysis.h deleted file mode 120000 index 7acfc90bef..0000000000 --- a/include/media/nbaio/PerformanceAnalysis.h +++ /dev/null @@ -1 +0,0 @@ -../../../media/libnbaio/include/media/nbaio/PerformanceAnalysis.h \ No newline at end of file diff --git a/include/media/nbaio/ReportPerformance.h b/include/media/nbaio/ReportPerformance.h deleted file mode 120000 index bd596e37cb..0000000000 --- a/include/media/nbaio/ReportPerformance.h +++ /dev/null @@ -1 +0,0 @@ -../../../media/libnbaio/include/media/nbaio/ReportPerformance.h \ No newline at end of file diff --git a/include/media/nblog/NBLog.h b/include/media/nblog/NBLog.h new file mode 120000 index 0000000000..3cc366cf4d --- /dev/null +++ b/include/media/nblog/NBLog.h @@ -0,0 +1 @@ +../../../media/libnblog/include/media/nblog/NBLog.h \ No newline at end of file diff --git a/include/media/nblog/PerformanceAnalysis.h b/include/media/nblog/PerformanceAnalysis.h new file mode 120000 index 0000000000..6ead3bca76 --- /dev/null +++ b/include/media/nblog/PerformanceAnalysis.h @@ -0,0 +1 @@ +../../../media/libnblog/include/media/nblog/PerformanceAnalysis.h \ No newline at end of file diff --git a/include/media/nblog/ReportPerformance.h b/include/media/nblog/ReportPerformance.h new file mode 120000 index 0000000000..e9b8e80311 --- /dev/null +++ b/include/media/nblog/ReportPerformance.h @@ -0,0 +1 @@ +../../../media/libnblog/include/media/nblog/ReportPerformance.h \ No newline at end of file diff --git a/media/libaudioclient/include/media/AudioMixer.h b/media/libaudioclient/include/media/AudioMixer.h index 2bd2d01123..dcd4a5dd01 100644 --- a/media/libaudioclient/include/media/AudioMixer.h +++ b/media/libaudioclient/include/media/AudioMixer.h @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/media/libaudioprocessing/Android.mk b/media/libaudioprocessing/Android.mk index c8509844c8..da1ecc2042 100644 --- a/media/libaudioprocessing/Android.mk +++ b/media/libaudioprocessing/Android.mk @@ -24,6 +24,7 @@ LOCAL_SHARED_LIBRARIES := \ libcutils \ liblog \ libnbaio \ + libnblog \ libsonic \ libutils \ diff --git a/media/libnbaio/Android.bp b/media/libnbaio/Android.bp index 4220b778e5..a4df38dcab 100644 --- a/media/libnbaio/Android.bp +++ b/media/libnbaio/Android.bp @@ -41,11 +41,8 @@ cc_library_shared { "AudioBufferProviderSource.cpp", "AudioStreamInSource.cpp", "AudioStreamOutSink.cpp", - "NBLog.cpp", - "PerformanceAnalysis.cpp", "Pipe.cpp", "PipeReader.cpp", - "ReportPerformance.cpp", "SourceAudioBufferProvider.cpp", ], diff --git a/media/libnblog/Android.bp b/media/libnblog/Android.bp new file mode 100644 index 0000000000..74aaf77a18 --- /dev/null +++ b/media/libnblog/Android.bp @@ -0,0 +1,28 @@ +cc_library_shared { + + name: "libnblog", + + srcs: [ + "NBLog.cpp", + "PerformanceAnalysis.cpp", + "ReportPerformance.cpp", + ], + + shared_libs: [ + "libaudioutils", + "libbinder", + "libcutils", + "liblog", + "libutils", + ], + + cflags: [ + "-Werror", + "-Wall", + ], + + include_dirs: ["system/media/audio_utils/include"], + + export_include_dirs: ["include"], + +} diff --git a/media/libnbaio/NBLog.cpp b/media/libnblog/NBLog.cpp similarity index 99% rename from media/libnbaio/NBLog.cpp rename to media/libnblog/NBLog.cpp index ad38390309..c8c7195939 100644 --- a/media/libnbaio/NBLog.cpp +++ b/media/libnblog/NBLog.cpp @@ -34,9 +34,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/media/libnbaio/PerformanceAnalysis.cpp b/media/libnblog/PerformanceAnalysis.cpp similarity index 99% rename from media/libnbaio/PerformanceAnalysis.cpp rename to media/libnblog/PerformanceAnalysis.cpp index 9e0f84d797..478c4602c0 100644 --- a/media/libnbaio/PerformanceAnalysis.cpp +++ b/media/libnblog/PerformanceAnalysis.cpp @@ -33,9 +33,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/media/libnbaio/ReportPerformance.cpp b/media/libnblog/ReportPerformance.cpp similarity index 97% rename from media/libnbaio/ReportPerformance.cpp rename to media/libnblog/ReportPerformance.cpp index efc1b84d21..827e731a88 100644 --- a/media/libnbaio/ReportPerformance.cpp +++ b/media/libnblog/ReportPerformance.cpp @@ -27,9 +27,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/media/libnbaio/include/media/nbaio/NBLog.h b/media/libnblog/include/media/nblog/NBLog.h similarity index 99% rename from media/libnbaio/include/media/nbaio/NBLog.h rename to media/libnblog/include/media/nblog/NBLog.h index 2c00386cf4..ebb88f0f9b 100644 --- a/media/libnbaio/include/media/nbaio/NBLog.h +++ b/media/libnblog/include/media/nblog/NBLog.h @@ -26,8 +26,8 @@ #include #include -#include -#include +#include +#include #include #include diff --git a/media/libnbaio/include/media/nbaio/PerformanceAnalysis.h b/media/libnblog/include/media/nblog/PerformanceAnalysis.h similarity index 99% rename from media/libnbaio/include/media/nbaio/PerformanceAnalysis.h rename to media/libnblog/include/media/nblog/PerformanceAnalysis.h index 50367be9fd..ddfe9d67da 100644 --- a/media/libnbaio/include/media/nbaio/PerformanceAnalysis.h +++ b/media/libnblog/include/media/nblog/PerformanceAnalysis.h @@ -21,7 +21,7 @@ #include #include -#include +#include namespace android { diff --git a/media/libnbaio/include/media/nbaio/ReportPerformance.h b/media/libnblog/include/media/nblog/ReportPerformance.h similarity index 100% rename from media/libnbaio/include/media/nbaio/ReportPerformance.h rename to media/libnblog/include/media/nblog/ReportPerformance.h diff --git a/services/audioflinger/Android.mk b/services/audioflinger/Android.mk index d0454d4afa..7419e648c8 100644 --- a/services/audioflinger/Android.mk +++ b/services/audioflinger/Android.mk @@ -51,6 +51,7 @@ LOCAL_SHARED_LIBRARIES := \ libmedialogservice \ libmediautils \ libnbaio \ + libnblog \ libpowermanager \ libserviceutility \ libmediautils \ diff --git a/services/audioflinger/AudioFlinger.h b/services/audioflinger/AudioFlinger.h index de617b9533..dff94d2e75 100644 --- a/services/audioflinger/AudioFlinger.h +++ b/services/audioflinger/AudioFlinger.h @@ -71,7 +71,7 @@ #include -#include +#include #include #include diff --git a/services/audioflinger/FastMixerState.h b/services/audioflinger/FastMixerState.h index 5a55c7a3e2..2be1e91930 100644 --- a/services/audioflinger/FastMixerState.h +++ b/services/audioflinger/FastMixerState.h @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include "FastThreadState.h" namespace android { diff --git a/services/audioflinger/FastThreadState.h b/services/audioflinger/FastThreadState.h index f18f8465b1..54c0dc65f7 100644 --- a/services/audioflinger/FastThreadState.h +++ b/services/audioflinger/FastThreadState.h @@ -19,7 +19,7 @@ #include "Configuration.h" #include -#include +#include namespace android { diff --git a/services/audioflinger/TypedLogger.h b/services/audioflinger/TypedLogger.h index 909af097f4..cae74b1b3c 100644 --- a/services/audioflinger/TypedLogger.h +++ b/services/audioflinger/TypedLogger.h @@ -18,7 +18,9 @@ #ifndef ANDROID_TYPED_LOGGER_H #define ANDROID_TYPED_LOGGER_H -#include +// This is the client API for the typed logger. + +#include #include /* diff --git a/services/medialog/Android.mk b/services/medialog/Android.mk index 423b186f5d..4f2630e34f 100644 --- a/services/medialog/Android.mk +++ b/services/medialog/Android.mk @@ -4,7 +4,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := MediaLogService.cpp IMediaLogService.cpp -LOCAL_SHARED_LIBRARIES := libbinder libutils liblog libnbaio libaudioutils +LOCAL_SHARED_LIBRARIES := libbinder libutils liblog libnbaio libnblog libaudioutils LOCAL_MULTILIB := $(AUDIOSERVER_MULTILIB) diff --git a/services/medialog/MediaLogService.cpp b/services/medialog/MediaLogService.cpp index fe19b6b582..1be5544457 100644 --- a/services/medialog/MediaLogService.cpp +++ b/services/medialog/MediaLogService.cpp @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include "MediaLogService.h" diff --git a/services/medialog/MediaLogService.h b/services/medialog/MediaLogService.h index 39d9cc0981..c945d1f2b0 100644 --- a/services/medialog/MediaLogService.h +++ b/services/medialog/MediaLogService.h @@ -19,7 +19,7 @@ #include #include -#include +#include namespace android {