Merge "Convert libbinderwrapper_test_support to static library." am: f4de44321e am...

am: db8322cb30

Change-Id: I3d6fb4058a780428dbd5e23c0cdad3880af65e1d

diff --cc brillo/audio/audioservice/Android.mk
index 26e77d4,16fdb88..ada9fe2
--- 1/brillo/audio/audioservice/Android.mk
--- 2/brillo/audio/audioservice/Android.mk
+++ b/brillo/audio/audioservice/Android.mk
@@@ -99,11 -99,11 +99,11 @@@ LOCAL_SRC_FILES := 
    test/brillo_audio_manager_test.cpp
  LOCAL_AIDL_INCLUDES := $(LOCAL_PATH)/aidl
  LOCAL_SHARED_LIBRARIES := \
-   $(audio_service_shared_libraries) \
-   libbinderwrapper_test_support
+   $(audio_service_shared_libraries)
  LOCAL_STATIC_LIBRARIES := \
    libBionicGtestMain \
+   libbinderwrapper_test_support \
    libchrome_test_helpers \
    libgmock
 -LOCAL_CFLAGS := -Wno-sign-compare -Wall
 +LOCAL_CFLAGS := -Wno-sign-compare -Wall -Werror
  include $(BUILD_NATIVE_TEST)