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 /media/mediaserver | |
| 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 'media/mediaserver')
| -rw-r--r-- | media/mediaserver/Android.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/media/mediaserver/Android.mk b/media/mediaserver/Android.mk index 1ac647a..d07bc99 100644 --- a/media/mediaserver/Android.mk +++ b/media/mediaserver/Android.mk @@ -35,5 +35,6 @@ LOCAL_C_INCLUDES := \ frameworks/av/services/camera/libcameraservice LOCAL_MODULE:= mediaserver +LOCAL_32_BIT_ONLY := true include $(BUILD_EXECUTABLE) |