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

am: 075589d

* commit '075589d8d17d9b407e6dfef2dea5397dc5452b3a':
  brillo: Add client library for brilloaudioservice.

Change-Id: I04e7ce7fe44e72792b0e8953fd7c1f79e9d2bada

diff --cc brillo/audio/audioservice/Android.mk
index 09da9f7,c1d9be6..de4cb24
--- 1/brillo/audio/audioservice/Android.mk
--- 2/brillo/audio/audioservice/Android.mk
+++ b/brillo/audio/audioservice/Android.mk
@@@ -61,6 -82,25 +82,26 @@@ LOCAL_STATIC_LIBRARIES := 
    libBionicGtestMain \
    libchrome_test_helpers \
    libgmock
 -LOCAL_CFLAGS := -Wno-sign-compare -Wall
 +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)