commit f4de44321eb6f830a773cc1d608d9f07c1d9c8bf
author Treehugger Robot <treehugger-gerrit@google.com> Sat Mar 04 07:03:34 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Mar 04 07:03:34 2017 +0000
tree 2befa314f83f1469306d9c284d1a686adb3b8b8d
parent fe8180538447e236e9435e714f96a9d8597a3903
parent f1144d91a62416f26c4cf21ddb28b58150caecc8

Merge "Convert libbinderwrapper_test_support to static library."

brillo/audio/audioservice/Android.mk

diff --git a/brillo/audio/audioservice/Android.mk b/brillo/audio/audioservice/Android.mk
index 225cb4a..16fdb88 100644
--- a/brillo/audio/audioservice/Android.mk
+++ b/brillo/audio/audioservice/Android.mk
@@ -77,10 +77,10 @@
   test/audio_volume_handler_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 := -Werror -Wall
@@ -99,10 +99,10 @@
   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