Convert libaudioflinger to Android.bp
This makes the libaudioflinger build deterministic between
devices.
A few notes:
- the include-path-for include is obsolete, so it was removed
- the AUDIOSERVER_MULTILIB use was removed, as I believe it's
unused
Bug: 121208203
Test: make
Change-Id: I08eb0d7f53f1fbcef3e14faa3ea75b5326383ef8
diff --git a/services/audioflinger/Android.bp b/services/audioflinger/Android.bp
new file mode 100644
index 0000000..96ad54b
--- /dev/null
+++ b/services/audioflinger/Android.bp
@@ -0,0 +1,73 @@
+
+
+cc_library_shared {
+ name: "libaudioflinger",
+
+ srcs: [
+ "AudioFlinger.cpp",
+ "AudioHwDevice.cpp",
+ "AudioStreamOut.cpp",
+ "AudioWatchdog.cpp",
+ "BufLog.cpp",
+ "Effects.cpp",
+ "FastCapture.cpp",
+ "FastCaptureDumpState.cpp",
+ "FastCaptureState.cpp",
+ "FastMixer.cpp",
+ "FastMixerDumpState.cpp",
+ "FastMixerState.cpp",
+ "FastThread.cpp",
+ "FastThreadDumpState.cpp",
+ "FastThreadState.cpp",
+ "NBAIO_Tee.cpp",
+ "PatchPanel.cpp",
+ "SpdifStreamOut.cpp",
+ "StateQueue.cpp",
+ "Threads.cpp",
+ "Tracks.cpp",
+ "TypedLogger.cpp",
+ ],
+
+ include_dirs: [
+ "frameworks/av/services/audiopolicy",
+ "frameworks/av/services/medialog",
+ ],
+
+ shared_libs: [
+ "libaudiohal",
+ "libaudioprocessing",
+ "libaudiospdif",
+ "libaudioutils",
+ "libcutils",
+ "libutils",
+ "liblog",
+ "libbinder",
+ "libaudioclient",
+ "libmedialogservice",
+ "libmediametrics",
+ "libmediautils",
+ "libnbaio",
+ "libnblog",
+ "libpowermanager",
+ "libmediautils",
+ "libmemunreachable",
+ "libmedia_helper",
+ "libvibrator",
+ ],
+
+ static_libs: [
+ "libcpustats",
+ "libsndfile",
+ ],
+
+ cflags: [
+ "-DSTATE_QUEUE_INSTANTIATIONS=\"StateQueueInstantiations.cpp\"",
+ "-fvisibility=hidden",
+ "-Werror",
+ "-Wall",
+ ],
+ sanitize: {
+ integer_overflow: true,
+ },
+
+}
diff --git a/services/audioflinger/Android.mk b/services/audioflinger/Android.mk
deleted file mode 100644
index 40980a6..0000000
--- a/services/audioflinger/Android.mk
+++ /dev/null
@@ -1,74 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES:= \
- AudioFlinger.cpp \
- Threads.cpp \
- Tracks.cpp \
- AudioHwDevice.cpp \
- AudioStreamOut.cpp \
- SpdifStreamOut.cpp \
- Effects.cpp \
- PatchPanel.cpp \
- StateQueue.cpp \
- BufLog.cpp \
- TypedLogger.cpp \
- NBAIO_Tee.cpp \
-
-LOCAL_C_INCLUDES := \
- frameworks/av/services/audiopolicy \
- frameworks/av/services/medialog \
- $(call include-path-for, audio-utils)
-
-LOCAL_SHARED_LIBRARIES := \
- libaudiohal \
- libaudioprocessing \
- libaudiospdif \
- libaudioutils \
- libcutils \
- libutils \
- liblog \
- libbinder \
- libaudioclient \
- libmedialogservice \
- libmediametrics \
- libmediautils \
- libnbaio \
- libnblog \
- libpowermanager \
- libmediautils \
- libmemunreachable \
- libmedia_helper \
- libvibrator
-
-LOCAL_STATIC_LIBRARIES := \
- libcpustats \
- libsndfile \
-
-LOCAL_MULTILIB := $(AUDIOSERVER_MULTILIB)
-
-LOCAL_MODULE:= libaudioflinger
-
-LOCAL_SRC_FILES += \
- AudioWatchdog.cpp \
- FastCapture.cpp \
- FastCaptureDumpState.cpp \
- FastCaptureState.cpp \
- FastMixer.cpp \
- FastMixerDumpState.cpp \
- FastMixerState.cpp \
- FastThread.cpp \
- FastThreadDumpState.cpp \
- FastThreadState.cpp
-
-LOCAL_CFLAGS += -DSTATE_QUEUE_INSTANTIATIONS='"StateQueueInstantiations.cpp"'
-
-LOCAL_CFLAGS += -fvisibility=hidden
-
-LOCAL_CFLAGS += -Werror -Wall
-LOCAL_SANITIZE := integer_overflow
-
-include $(BUILD_SHARED_LIBRARY)
-
-include $(call all-makefiles-under,$(LOCAL_PATH))