summaryrefslogtreecommitdiffstats
path: root/media/mediaserver
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@android.com>2014-03-14 20:45:50 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-03-14 20:45:50 +0000
commit089affb6c2d9ed1e2d49df4be02d30dc490506f9 (patch)
tree1ec3cbbd3a0d1de16e11a6a0585b5833f3843f66 /media/mediaserver
parent4a67fc49d926c75fa6a96160ba5627fb0e209db6 (diff)
parentaf783aa91f7a279153fb8bab8d0d6b9f737996e9 (diff)
downloadframeworks_av-089affb6c2d9ed1e2d49df4be02d30dc490506f9.zip
frameworks_av-089affb6c2d9ed1e2d49df4be02d30dc490506f9.tar.gz
frameworks_av-089affb6c2d9ed1e2d49df4be02d30dc490506f9.tar.bz2
Merge "mediaserver and associated services are 32-bit only"
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 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)