diff options
| author | Glenn Kasten <gkasten@google.com> | 2014-04-30 23:56:24 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-30 23:56:24 +0000 |
| commit | 3c782246d5ee9869f2167a00df748eac1b9e9153 (patch) | |
| tree | 43bb0d1abf51f5918c555ea914938ab6652354d5 /cmds | |
| parent | 0d79b935f533220613f492ab06a12f5cc9591805 (diff) | |
| parent | b1d2b51c4652ecdea907a5a6865d55a9bc52c6a2 (diff) | |
| download | frameworks_av-3c782246d5ee9869f2167a00df748eac1b9e9153.zip frameworks_av-3c782246d5ee9869f2167a00df748eac1b9e9153.tar.gz frameworks_av-3c782246d5ee9869f2167a00df748eac1b9e9153.tar.bz2 | |
am b1d2b51c: am 761636f3: Merge "Do not force all command-line apps to be 32-bit only"
* commit 'b1d2b51c4652ecdea907a5a6865d55a9bc52c6a2':
Do not force all command-line apps to be 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, 0 insertions, 18 deletions
diff --git a/cmds/screenrecord/Android.mk b/cmds/screenrecord/Android.mk index 57a2234..d77fdb6 100644 --- a/cmds/screenrecord/Android.mk +++ b/cmds/screenrecord/Android.mk @@ -40,6 +40,4 @@ 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 e2e389b..561ce02 100644 --- a/cmds/stagefright/Android.mk +++ b/cmds/stagefright/Android.mk @@ -23,8 +23,6 @@ LOCAL_MODULE_TAGS := optional LOCAL_MODULE:= stagefright -LOCAL_32_BIT_ONLY := true - include $(BUILD_EXECUTABLE) ################################################################################ @@ -48,8 +46,6 @@ LOCAL_MODULE_TAGS := optional LOCAL_MODULE:= record -LOCAL_32_BIT_ONLY := true - include $(BUILD_EXECUTABLE) ################################################################################ @@ -73,8 +69,6 @@ LOCAL_MODULE_TAGS := optional LOCAL_MODULE:= recordvideo -LOCAL_32_BIT_ONLY := true - include $(BUILD_EXECUTABLE) @@ -99,8 +93,6 @@ LOCAL_MODULE_TAGS := optional LOCAL_MODULE:= audioloop -LOCAL_32_BIT_ONLY := true - include $(BUILD_EXECUTABLE) ################################################################################ @@ -124,8 +116,6 @@ LOCAL_MODULE_TAGS := optional LOCAL_MODULE:= stream -LOCAL_32_BIT_ONLY := true - include $(BUILD_EXECUTABLE) ################################################################################ @@ -149,8 +139,6 @@ LOCAL_MODULE_TAGS := optional LOCAL_MODULE:= sf2 -LOCAL_32_BIT_ONLY := true - include $(BUILD_EXECUTABLE) ################################################################################ @@ -175,8 +163,6 @@ LOCAL_MODULE_TAGS := optional LOCAL_MODULE:= codec -LOCAL_32_BIT_ONLY := true - include $(BUILD_EXECUTABLE) ################################################################################ @@ -200,6 +186,4 @@ LOCAL_MODULE_TAGS := optional LOCAL_MODULE:= muxer -LOCAL_32_BIT_ONLY := true - include $(BUILD_EXECUTABLE) |