summaryrefslogtreecommitdiffstats
path: root/media/mediaserver
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2014-03-14 14:22:08 -0700
committerGlenn Kasten <gkasten@google.com>2014-03-14 14:22:08 -0700
commit758799cef41fc5495f59eeb6249d02ce9154cde8 (patch)
tree5cbfa825fd668d81c6fe6a8ec485dd8ebb2fd151 /media/mediaserver
parentbeb57a5a08207af80180b93dd80d611a85997c43 (diff)
parent3c7801882bbb6d5f3cc641525a54cb8a6c4aca34 (diff)
downloadframeworks_av-758799cef41fc5495f59eeb6249d02ce9154cde8.zip
frameworks_av-758799cef41fc5495f59eeb6249d02ce9154cde8.tar.gz
frameworks_av-758799cef41fc5495f59eeb6249d02ce9154cde8.tar.bz2
resolved conflicts for merge of 3c780188 to master
Change-Id: Ic579d346c27ff05ea6444faaa60fa6caaec86fbf
Diffstat (limited to 'media/mediaserver')
-rw-r--r--media/mediaserver/Android.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/media/mediaserver/Android.mk b/media/mediaserver/Android.mk
index f848054..09a9ef8 100644
--- a/media/mediaserver/Android.mk
+++ b/media/mediaserver/Android.mk
@@ -36,5 +36,6 @@ LOCAL_C_INCLUDES := \
frameworks/av/services/camera/libcameraservice
LOCAL_MODULE:= mediaserver
+LOCAL_32_BIT_ONLY := true
include $(BUILD_EXECUTABLE)