Merge "brillo: Add client library for brilloaudioservice." am: 1247f05

[android-x86/system-media.git] / brillo / audio / audioservice / Android.mk

diff --git a/brillo/audio/audioservice/Android.mk b/brillo/audio/audioservice/Android.mk
index 09da9f7..de4cb24 100644 (file)
--- a/brillo/audio/audioservice/Android.mk
+++ b/brillo/audio/audioservice/Android.mk
@@ -24,6 +24,16 @@ audio_service_shared_libraries := \
   libmedia \
   libutils
 
+audio_client_sources := \
+  aidl/android/brillo/brilloaudioservice/IAudioServiceCallback.aidl \
+  aidl/android/brillo/brilloaudioservice/IBrilloAudioService.aidl \
+  audio_service_callback.cpp \
+  brillo_audio_client.cpp \
+  brillo_audio_client_helpers.cpp \
+  brillo_audio_device_info.cpp \
+  brillo_audio_device_info_internal.cpp \
+  brillo_audio_manager.cpp
+
 audio_service_sources := \
   aidl/android/brillo/brilloaudioservice/IAudioServiceCallback.aidl \
   aidl/android/brillo/brilloaudioservice/IBrilloAudioService.aidl \
@@ -44,7 +54,18 @@ LOCAL_CFLAGS := -Werror -Wall
 LOCAL_INIT_RC := brilloaudioserv.rc
 include $(BUILD_EXECUTABLE)
 
-# Unit tests for audio device handler.
+# Audio client library.
+# =============================================================================
+include $(CLEAR_VARS)
+LOCAL_MODULE := libbrilloaudio
+LOCAL_SRC_FILES := \
+  $(audio_client_sources)
+LOCAL_AIDL_INCLUDES := $(LOCAL_PATH)/aidl
+LOCAL_SHARED_LIBRARIES := $(audio_service_shared_libraries)
+LOCAL_CFLAGS := -Wall -std=c++14
+include $(BUILD_SHARED_LIBRARY)
+
+# Unit tests for the Brillo audio service.
 # =============================================================================
 include $(CLEAR_VARS)
 LOCAL_MODULE := brilloaudioservice_test
@@ -64,3 +85,23 @@ LOCAL_STATIC_LIBRARIES := \
 LOCAL_CFLAGS := -Werror -Wall
 LOCAL_CFLAGS += -Wno-sign-compare
 include $(BUILD_NATIVE_TEST)
+
+# Unit tests for the Brillo audio client.
+# =============================================================================
+include $(CLEAR_VARS)
+LOCAL_MODULE := brilloaudioclient_test
+LOCAL_SRC_FILES := \
+  $(audio_client_sources) \
+  test/audio_service_callback_test.cpp \
+  test/brillo_audio_device_info_internal_test.cpp
+LOCAL_AIDL_INCLUDES := $(LOCAL_PATH)/aidl
+LOCAL_C_INCLUDES := external/gtest/include
+LOCAL_SHARED_LIBRARIES := \
+  $(audio_service_shared_libraries) \
+  libbinderwrapper_test_support
+LOCAL_STATIC_LIBRARIES := \
+  libBionicGtestMain \
+  libchrome_test_helpers \
+  libgmock
+LOCAL_CFLAGS := -Wno-sign-compare -Wall
+include $(BUILD_NATIVE_TEST)