diff options
| author | Glenn Kasten <gkasten@android.com> | 2014-03-14 20:53:02 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-14 20:53:02 +0000 |
| commit | 3c7801882bbb6d5f3cc641525a54cb8a6c4aca34 (patch) | |
| tree | f6f5e9f9d4ffecd658b76a3ef176564253768e3b /services | |
| parent | f1ac623fcc6bbda2faff9752cd611182a897afe1 (diff) | |
| parent | 089affb6c2d9ed1e2d49df4be02d30dc490506f9 (diff) | |
| download | frameworks_av-3c7801882bbb6d5f3cc641525a54cb8a6c4aca34.zip frameworks_av-3c7801882bbb6d5f3cc641525a54cb8a6c4aca34.tar.gz frameworks_av-3c7801882bbb6d5f3cc641525a54cb8a6c4aca34.tar.bz2 | |
am 089affb6: Merge "mediaserver and associated services are 32-bit only"
* commit '089affb6c2d9ed1e2d49df4be02d30dc490506f9':
mediaserver and associated services are 32-bit only
Diffstat (limited to 'services')
| -rw-r--r-- | services/audioflinger/Android.mk | 1 | ||||
| -rw-r--r-- | services/camera/libcameraservice/Android.mk | 1 | ||||
| -rw-r--r-- | services/medialog/Android.mk | 2 |
3 files changed, 4 insertions, 0 deletions
diff --git a/services/audioflinger/Android.mk b/services/audioflinger/Android.mk index 54377f1..5fcc9ba 100644 --- a/services/audioflinger/Android.mk +++ b/services/audioflinger/Android.mk @@ -52,6 +52,7 @@ LOCAL_STATIC_LIBRARIES := \ libmedia_helper LOCAL_MODULE:= libaudioflinger +LOCAL_32_BIT_ONLY := true LOCAL_SRC_FILES += FastMixer.cpp FastMixerState.cpp AudioWatchdog.cpp diff --git a/services/camera/libcameraservice/Android.mk b/services/camera/libcameraservice/Android.mk index 51ba698..4352b17 100644 --- a/services/camera/libcameraservice/Android.mk +++ b/services/camera/libcameraservice/Android.mk @@ -59,5 +59,6 @@ LOCAL_C_INCLUDES += \ LOCAL_CFLAGS += -Wall -Wextra LOCAL_MODULE:= libcameraservice +LOCAL_32_BIT_ONLY := true include $(BUILD_SHARED_LIBRARY) diff --git a/services/medialog/Android.mk b/services/medialog/Android.mk index 08006c8..95f2fef 100644 --- a/services/medialog/Android.mk +++ b/services/medialog/Android.mk @@ -8,4 +8,6 @@ LOCAL_SHARED_LIBRARIES := libmedia libbinder libutils liblog libnbaio LOCAL_MODULE:= libmedialogservice +LOCAL_32_BIT_ONLY := true + include $(BUILD_SHARED_LIBRARY) |