summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@android.com>2014-03-14 20:53:02 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-14 20:53:02 +0000
commit3c7801882bbb6d5f3cc641525a54cb8a6c4aca34 (patch)
treef6f5e9f9d4ffecd658b76a3ef176564253768e3b /media/libmediaplayerservice
parentf1ac623fcc6bbda2faff9752cd611182a897afe1 (diff)
parent089affb6c2d9ed1e2d49df4be02d30dc490506f9 (diff)
downloadframeworks_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/libmediaplayerservice')
-rw-r--r--media/libmediaplayerservice/Android.mk2
1 files changed, 2 insertions, 0 deletions
diff --git a/media/libmediaplayerservice/Android.mk b/media/libmediaplayerservice/Android.mk
index 8f21632..85c9464 100644
--- a/media/libmediaplayerservice/Android.mk
+++ b/media/libmediaplayerservice/Android.mk
@@ -54,6 +54,8 @@ LOCAL_C_INCLUDES := \
LOCAL_MODULE:= libmediaplayerservice
+LOCAL_32_BIT_ONLY := true
+
include $(BUILD_SHARED_LIBRARY)
include $(call all-makefiles-under,$(LOCAL_PATH))