diff options
| author | Chong Zhang <chz@google.com> | 2015-01-07 10:42:33 -0800 |
|---|---|---|
| committer | Chong Zhang <chz@google.com> | 2015-01-07 10:50:09 -0800 |
| commit | 5db7897ddd32e3ec3ab45ecdb6f21b6265e7e14a (patch) | |
| tree | e586c65974e885af85d209c811acb3d3cd592736 | |
| parent | 71d13d4c94cea2113d074cf0d0c6e07ad68ff3ec (diff) | |
| download | frameworks_av-5db7897ddd32e3ec3ab45ecdb6f21b6265e7e14a.zip frameworks_av-5db7897ddd32e3ec3ab45ecdb6f21b6265e7e14a.tar.gz frameworks_av-5db7897ddd32e3ec3ab45ecdb6f21b6265e7e14a.tar.bz2 | |
make libserviceutility a shared lib
so that we have only one getpid_cached in mediaserver process
bug: 18919657
Change-Id: Iff3cd932c9110e874b3885f79705f49bf3e3f1fc
| -rw-r--r-- | services/audioflinger/Android.mk | 14 | ||||
| -rw-r--r-- | services/audiopolicy/Android.mk | 6 | ||||
| -rw-r--r-- | services/soundtrigger/Android.mk | 4 |
3 files changed, 14 insertions, 10 deletions
diff --git a/services/audioflinger/Android.mk b/services/audioflinger/Android.mk index 697fb37..f0196c6 100644 --- a/services/audioflinger/Android.mk +++ b/services/audioflinger/Android.mk @@ -19,7 +19,13 @@ LOCAL_SRC_FILES := \ # FIXME Move this library to frameworks/native LOCAL_MODULE := libserviceutility -include $(BUILD_STATIC_LIBRARY) +LOCAL_SHARED_LIBRARIES := \ + libcutils \ + libutils \ + liblog \ + libbinder + +include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) @@ -51,13 +57,13 @@ LOCAL_SHARED_LIBRARIES := \ libhardware \ libhardware_legacy \ libeffects \ - libpowermanager + libpowermanager \ + libserviceutility LOCAL_STATIC_LIBRARIES := \ libscheduling_policy \ libcpustats \ - libmedia_helper \ - libserviceutility + libmedia_helper LOCAL_MODULE:= libaudioflinger LOCAL_32_BIT_ONLY := true 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 diff --git a/services/soundtrigger/Android.mk b/services/soundtrigger/Android.mk index 572ae56..ecc49ae 100644 --- a/services/soundtrigger/Android.mk +++ b/services/soundtrigger/Android.mk @@ -32,9 +32,7 @@ LOCAL_SHARED_LIBRARIES:= \ libcutils \ libhardware \ libsoundtrigger \ - libmedia - -LOCAL_STATIC_LIBRARIES := \ + libmedia \ libserviceutility LOCAL_C_INCLUDES += \ |