commit 761636f3c2904a9e1fb03991b6896ed7113f8596
author Glenn Kasten <gkasten@google.com> Wed Apr 30 23:50:37 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Apr 30 23:50:38 2014 +0000
tree da969edc67f55e9c64de0bf8e6f533925b3ef9c0
parent 416685d0cbab40bfc48b0e787206b5d5c2e2ec25
parent d2a29d0b7a899ed7474d54530e8d441f09683bf3

Merge "Do not force all command-line apps to be 32-bit only"

cmds/screenrecord/Android.mk

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:= screenrecord
 
-LOCAL_32_BIT_ONLY := true
-
 include $(BUILD_EXECUTABLE)

cmds/stagefright/Android.mk

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:= stagefright
 
-LOCAL_32_BIT_ONLY := true
-
 include $(BUILD_EXECUTABLE)
 
 ################################################################################
@@ -48,8 +46,6 @@
 
 LOCAL_MODULE:= record
 
-LOCAL_32_BIT_ONLY := true
-
 include $(BUILD_EXECUTABLE)
 
 ################################################################################
@@ -73,8 +69,6 @@
 
 LOCAL_MODULE:= recordvideo
 
-LOCAL_32_BIT_ONLY := true
-
 include $(BUILD_EXECUTABLE)
 
 
@@ -99,8 +93,6 @@
 
 LOCAL_MODULE:= audioloop
 
-LOCAL_32_BIT_ONLY := true
-
 include $(BUILD_EXECUTABLE)
 
 ################################################################################
@@ -124,8 +116,6 @@
 
 LOCAL_MODULE:= stream
 
-LOCAL_32_BIT_ONLY := true
-
 include $(BUILD_EXECUTABLE)
 
 ################################################################################
@@ -149,8 +139,6 @@
 
 LOCAL_MODULE:= sf2
 
-LOCAL_32_BIT_ONLY := true
-
 include $(BUILD_EXECUTABLE)
 
 ################################################################################
@@ -175,8 +163,6 @@
 
 LOCAL_MODULE:= codec
 
-LOCAL_32_BIT_ONLY := true
-
 include $(BUILD_EXECUTABLE)
 
 ################################################################################
@@ -200,6 +186,4 @@
 
 LOCAL_MODULE:= muxer
 
-LOCAL_32_BIT_ONLY := true
-
 include $(BUILD_EXECUTABLE)