diff options
| author | Glenn Kasten <gkasten@google.com> | 2014-03-14 14:22:08 -0700 |
|---|---|---|
| committer | Glenn Kasten <gkasten@google.com> | 2014-03-14 14:22:08 -0700 |
| commit | 758799cef41fc5495f59eeb6249d02ce9154cde8 (patch) | |
| tree | 5cbfa825fd668d81c6fe6a8ec485dd8ebb2fd151 /cmds | |
| parent | beb57a5a08207af80180b93dd80d611a85997c43 (diff) | |
| parent | 3c7801882bbb6d5f3cc641525a54cb8a6c4aca34 (diff) | |
| download | frameworks_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')
| -rw-r--r-- | cmds/screenrecord/Android.mk | 2 | ||||
| -rw-r--r-- | cmds/stagefright/Android.mk | 16 |
2 files changed, 18 insertions, 0 deletions
diff --git a/cmds/screenrecord/Android.mk b/cmds/screenrecord/Android.mk index 6747e60..6ee2884 100644 --- a/cmds/screenrecord/Android.mk +++ b/cmds/screenrecord/Android.mk @@ -41,4 +41,6 @@ LOCAL_MODULE_TAGS := optional LOCAL_MODULE:= screenrecord +LOCAL_32_BIT_ONLY := true + include $(BUILD_EXECUTABLE) 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) |