summaryrefslogtreecommitdiffstats
path: root/services/audiopolicy
diff options
context:
space:
mode:
authorChong Zhang <chz@google.com>2015-01-07 19:19:32 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-01-07 19:19:33 +0000
commitcfa5bf04ff250a14b11a75bcfa35ee2d6dbab4e9 (patch)
treeb985df2fc3985bfe5589cb6955ed3369d7d9feef /services/audiopolicy
parent610255e8f2d02cb3513695eacf1c37d66b3553d6 (diff)
parent5db7897ddd32e3ec3ab45ecdb6f21b6265e7e14a (diff)
downloadframeworks_av-cfa5bf04ff250a14b11a75bcfa35ee2d6dbab4e9.zip
frameworks_av-cfa5bf04ff250a14b11a75bcfa35ee2d6dbab4e9.tar.gz
frameworks_av-cfa5bf04ff250a14b11a75bcfa35ee2d6dbab4e9.tar.bz2
Merge "make libserviceutility a shared lib" into lmp-mr1-dev
Diffstat (limited to 'services/audiopolicy')
-rw-r--r--services/audiopolicy/Android.mk6
1 files changed, 3 insertions, 3 deletions
diff --git a/services/audiopolicy/Android.mk b/services/audiopolicy/Android.mk
index 6512c38..188fc89 100644
--- a/services/audiopolicy/Android.mk
+++ b/services/audiopolicy/Android.mk
@@ -30,7 +30,8 @@ LOCAL_SHARED_LIBRARIES := \
libbinder \
libmedia \
libhardware \
- libhardware_legacy
+ libhardware_legacy \
+ libserviceutility
ifneq ($(USE_LEGACY_AUDIO_POLICY), 1)
LOCAL_SHARED_LIBRARIES += \
@@ -38,8 +39,7 @@ LOCAL_SHARED_LIBRARIES += \
endif
LOCAL_STATIC_LIBRARIES := \
- libmedia_helper \
- libserviceutility
+ libmedia_helper
LOCAL_MODULE:= libaudiopolicyservice