summaryrefslogtreecommitdiffstats
path: root/cmds/stagefright
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 /cmds/stagefright
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 'cmds/stagefright')
-rw-r--r--cmds/stagefright/Android.mk16
1 files changed, 16 insertions, 0 deletions
diff --git a/cmds/stagefright/Android.mk b/cmds/stagefright/Android.mk
index 561ce02..e2e389b 100644
--- a/cmds/stagefright/Android.mk
+++ b/cmds/stagefright/Android.mk
@@ -23,6 +23,8 @@ LOCAL_MODULE_TAGS := optional
LOCAL_MODULE:= stagefright
+LOCAL_32_BIT_ONLY := true
+
include $(BUILD_EXECUTABLE)
################################################################################
@@ -46,6 +48,8 @@ LOCAL_MODULE_TAGS := optional
LOCAL_MODULE:= record
+LOCAL_32_BIT_ONLY := true
+
include $(BUILD_EXECUTABLE)
################################################################################
@@ -69,6 +73,8 @@ LOCAL_MODULE_TAGS := optional
LOCAL_MODULE:= recordvideo
+LOCAL_32_BIT_ONLY := true
+
include $(BUILD_EXECUTABLE)
@@ -93,6 +99,8 @@ LOCAL_MODULE_TAGS := optional
LOCAL_MODULE:= audioloop
+LOCAL_32_BIT_ONLY := true
+
include $(BUILD_EXECUTABLE)
################################################################################
@@ -116,6 +124,8 @@ LOCAL_MODULE_TAGS := optional
LOCAL_MODULE:= stream
+LOCAL_32_BIT_ONLY := true
+
include $(BUILD_EXECUTABLE)
################################################################################
@@ -139,6 +149,8 @@ LOCAL_MODULE_TAGS := optional
LOCAL_MODULE:= sf2
+LOCAL_32_BIT_ONLY := true
+
include $(BUILD_EXECUTABLE)
################################################################################
@@ -163,6 +175,8 @@ LOCAL_MODULE_TAGS := optional
LOCAL_MODULE:= codec
+LOCAL_32_BIT_ONLY := true
+
include $(BUILD_EXECUTABLE)
################################################################################
@@ -186,4 +200,6 @@ LOCAL_MODULE_TAGS := optional
LOCAL_MODULE:= muxer
+LOCAL_32_BIT_ONLY := true
+
include $(BUILD_EXECUTABLE)