diff options
| author | Glenn Kasten <gkasten@android.com> | 2014-03-14 20:53:02 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-14 20:53:02 +0000 |
| commit | 3c7801882bbb6d5f3cc641525a54cb8a6c4aca34 (patch) | |
| tree | f6f5e9f9d4ffecd658b76a3ef176564253768e3b /cmds | |
| parent | f1ac623fcc6bbda2faff9752cd611182a897afe1 (diff) | |
| parent | 089affb6c2d9ed1e2d49df4be02d30dc490506f9 (diff) | |
| download | frameworks_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 '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 d77fdb6..57a2234 100644 --- a/cmds/screenrecord/Android.mk +++ b/cmds/screenrecord/Android.mk @@ -40,4 +40,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) |