Merge "Revert "For checkbuild, disable all Wilhelm tests in 64-bit""
diff --git a/tests/Android.mk b/tests/Android.mk
index 1601242..9818656 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -32,7 +32,6 @@
$(eval LOCAL_MODULE := libopenslestests) \
$(eval LOCAL_MODULE_PATH := $(TARGET_OUT_DATA)/nativetest) \
$(eval LOCAL_MODULE_TAGS := $(module_tags)) \
- $(eval LOCAL_32_BIT_ONLY := true) \
$(eval include $(BUILD_EXECUTABLE)) \
)
diff --git a/tests/automated/Android.mk b/tests/automated/Android.mk
index ec5f7cc..c6cf7e1 100644
--- a/tests/automated/Android.mk
+++ b/tests/automated/Android.mk
@@ -33,8 +33,6 @@
LOCAL_MODULE_PATH := $(TARGET_OUT_DATA)/nativetest
-LOCAL_32_BIT_ONLY := true
-
include $(BUILD_EXECUTABLE)
# Build the manual test programs.
diff --git a/tests/examples/Android.mk b/tests/examples/Android.mk
index 4ecb2fb..d16164e 100644
--- a/tests/examples/Android.mk
+++ b/tests/examples/Android.mk
@@ -22,8 +22,6 @@
LOCAL_MODULE:= slesTest_recBuffQueue
-LOCAL_32_BIT_ONLY := true
-
include $(BUILD_EXECUTABLE)
# slesTest_playFdPath
@@ -48,8 +46,6 @@
LOCAL_MODULE:= slesTest_playFdPath
-LOCAL_32_BIT_ONLY := true
-
include $(BUILD_EXECUTABLE)
# slesTest_feedback
@@ -77,8 +73,6 @@
LOCAL_MODULE:= slesTest_feedback
-LOCAL_32_BIT_ONLY := true
-
include $(BUILD_EXECUTABLE)
# slesTest_sawtoothBufferQueue
@@ -104,8 +98,6 @@
LOCAL_MODULE:= slesTest_sawtoothBufferQueue
-LOCAL_32_BIT_ONLY := true
-
include $(BUILD_EXECUTABLE)
# slesTest_eqFdPath
@@ -128,8 +120,6 @@
LOCAL_CFLAGS += -DXP_UNIX
endif
-LOCAL_32_BIT_ONLY := true
-
LOCAL_MODULE:= slesTest_eqFdPath
include $(BUILD_EXECUTABLE)
@@ -156,8 +146,6 @@
LOCAL_MODULE:= slesTest_eqOutputPath
-LOCAL_32_BIT_ONLY := true
-
include $(BUILD_EXECUTABLE)
# slesTest_bassboostPath
@@ -182,8 +170,6 @@
LOCAL_MODULE:= slesTest_bassboostPath
-LOCAL_32_BIT_ONLY := true
-
include $(BUILD_EXECUTABLE)
# slesTest_virtualizer
@@ -206,8 +192,6 @@
LOCAL_CFLAGS += -DXP_UNIX
endif
-LOCAL_32_BIT_ONLY := true
-
LOCAL_MODULE:= slesTest_virtualizer
include $(BUILD_EXECUTABLE)
@@ -234,8 +218,6 @@
LOCAL_MODULE:= slesTest_effectCapabilities
-LOCAL_32_BIT_ONLY := true
-
include $(BUILD_EXECUTABLE)
# slesTest_sendToPresetReverb
@@ -260,8 +242,6 @@
LOCAL_MODULE:= slesTest_sendToPresetReverb
-LOCAL_32_BIT_ONLY := true
-
include $(BUILD_EXECUTABLE)
# slesTest_decodeToBuffQueue
@@ -286,8 +266,6 @@
LOCAL_MODULE:= slesTest_decodeToBuffQueue
-LOCAL_32_BIT_ONLY := true
-
include $(BUILD_EXECUTABLE)
###################
@@ -317,8 +295,6 @@
LOCAL_MODULE:= slesTest_decodeAac
-LOCAL_32_BIT_ONLY := true
-
include $(BUILD_EXECUTABLE)
#######################################
@@ -346,6 +322,4 @@
LOCAL_MODULE:= xaVideoDecoderCapabilities
-LOCAL_32_BIT_ONLY := true
-
include $(BUILD_EXECUTABLE)
diff --git a/tests/listening/Android.mk b/tests/listening/Android.mk
index c8f8cb1..8b165d1 100644
--- a/tests/listening/Android.mk
+++ b/tests/listening/Android.mk
@@ -22,8 +22,6 @@
LOCAL_MODULE:= slesTest_seekTorture
-LOCAL_32_BIT_ONLY := true
-
include $(BUILD_EXECUTABLE)
#
@@ -48,6 +46,4 @@
LOCAL_MODULE:= slesTest_playMuteSolo
-LOCAL_32_BIT_ONLY := true
-
include $(BUILD_EXECUTABLE)
diff --git a/tests/mimeUri/Android.mk b/tests/mimeUri/Android.mk
index 193c0b6..ac2ed88 100644
--- a/tests/mimeUri/Android.mk
+++ b/tests/mimeUri/Android.mk
@@ -24,8 +24,6 @@
LOCAL_MODULE:= slesTest_playStates
-LOCAL_32_BIT_ONLY := true
-
include $(BUILD_EXECUTABLE)
# slesTest_playStreamType
@@ -52,8 +50,6 @@
LOCAL_MODULE:= slesTest_playStreamType
-LOCAL_32_BIT_ONLY := true
-
include $(BUILD_EXECUTABLE)
# slesTest_playUri
@@ -80,8 +76,6 @@
LOCAL_MODULE:= slesTest_playUri
-LOCAL_32_BIT_ONLY := true
-
include $(BUILD_EXECUTABLE)
# slesTest_loopUri
@@ -108,8 +102,6 @@
LOCAL_MODULE:= slesTest_loopUri
-LOCAL_32_BIT_ONLY := true
-
include $(BUILD_EXECUTABLE)
# slesTest_playUri2
@@ -136,8 +128,6 @@
LOCAL_MODULE:= slesTest_playUri2
-LOCAL_32_BIT_ONLY := true
-
include $(BUILD_EXECUTABLE)
# slesTest_slowDownUri
@@ -164,8 +154,6 @@
LOCAL_MODULE:= slesTest_slowDownUri
-LOCAL_32_BIT_ONLY := true
-
include $(BUILD_EXECUTABLE)
# slesTest_manyPlayers
@@ -192,8 +180,6 @@
LOCAL_MODULE:= slesTest_manyPlayers
-LOCAL_32_BIT_ONLY := true
-
include $(BUILD_EXECUTABLE)
# slesTest_getPositionUri
@@ -220,6 +206,4 @@
LOCAL_MODULE:= slesTest_getPositionUri
-LOCAL_32_BIT_ONLY := true
-
include $(BUILD_EXECUTABLE)
diff --git a/tests/native-media/Android.mk b/tests/native-media/Android.mk
index b89e05e..73d7ec8 100644
--- a/tests/native-media/Android.mk
+++ b/tests/native-media/Android.mk
@@ -13,8 +13,6 @@
LOCAL_JNI_SHARED_LIBRARIES := libnative-media-jni
-LOCAL_32_BIT_ONLY := true
-
include $(BUILD_PACKAGE)
include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/tests/native-media/jni/Android.mk b/tests/native-media/jni/Android.mk
index d9cc5e4..83b86a0 100644
--- a/tests/native-media/jni/Android.mk
+++ b/tests/native-media/jni/Android.mk
@@ -11,6 +11,5 @@
LOCAL_PRELINK_MODULE := false
LOCAL_SHARED_LIBRARIES += libutils liblog libOpenMAXAL libandroid
-LOCAL_32_BIT_ONLY := true
include $(BUILD_SHARED_LIBRARY)
diff --git a/tests/sandbox/Android.mk b/tests/sandbox/Android.mk
index ee5816f..af4d750 100644
--- a/tests/sandbox/Android.mk
+++ b/tests/sandbox/Android.mk
@@ -27,8 +27,6 @@
LOCAL_MODULE:= slesTest_intbufq
-LOCAL_32_BIT_ONLY := true
-
include $(BUILD_EXECUTABLE)
# multiplay
@@ -56,8 +54,6 @@
LOCAL_MODULE:= slesTest_multiplay
-LOCAL_32_BIT_ONLY := true
-
include $(BUILD_EXECUTABLE)
# engine
@@ -90,8 +86,6 @@
LOCAL_MODULE:= slesTest_engine
-LOCAL_32_BIT_ONLY := true
-
include $(BUILD_EXECUTABLE)
# object
@@ -124,8 +118,6 @@
LOCAL_MODULE:= slesTest_object
-LOCAL_32_BIT_ONLY := true
-
include $(BUILD_EXECUTABLE)
# configbq
@@ -153,8 +145,6 @@
LOCAL_MODULE:= slesTest_configbq
-LOCAL_32_BIT_ONLY := true
-
include $(BUILD_EXECUTABLE)
# reverb
@@ -186,8 +176,6 @@
LOCAL_MODULE:= slesTest_reverb
-LOCAL_32_BIT_ONLY := true
-
include $(BUILD_EXECUTABLE)
# srcsink
@@ -219,8 +207,6 @@
LOCAL_MODULE:= slesTest_srcsink
-LOCAL_32_BIT_ONLY := true
-
include $(BUILD_EXECUTABLE)
# outputmix
@@ -253,8 +239,6 @@
LOCAL_MODULE:= slesTest_outputmix
-LOCAL_32_BIT_ONLY := true
-
include $(BUILD_EXECUTABLE)
# urimime
@@ -286,8 +270,6 @@
LOCAL_MODULE:= slesTest_urimime
-LOCAL_32_BIT_ONLY := true
-
include $(BUILD_EXECUTABLE)
# dim
@@ -319,8 +301,6 @@
LOCAL_MODULE:= slesTest_dim
-LOCAL_32_BIT_ONLY := true
-
include $(BUILD_EXECUTABLE)
# multithread
@@ -352,8 +332,6 @@
LOCAL_MODULE:= slesTest_multithread
-LOCAL_32_BIT_ONLY := true
-
include $(BUILD_EXECUTABLE)
# playbq
@@ -389,8 +367,6 @@
LOCAL_MODULE:= slesTest_playbq
-LOCAL_32_BIT_ONLY := true
-
include $(BUILD_EXECUTABLE)
# monkey
@@ -422,8 +398,6 @@
LOCAL_MODULE:= slesTest_monkey
-LOCAL_32_BIT_ONLY := true
-
include $(BUILD_EXECUTABLE)
# xa
@@ -455,8 +429,6 @@
LOCAL_MODULE:= slesTest_xa
-LOCAL_32_BIT_ONLY := true
-
include $(BUILD_EXECUTABLE)
# dual
@@ -489,8 +461,6 @@
LOCAL_MODULE:= slesTest_dual
-LOCAL_32_BIT_ONLY := true
-
include $(BUILD_EXECUTABLE)
# xaplay
@@ -525,6 +495,4 @@
LOCAL_MODULE:= xaplay
-LOCAL_32_BIT_ONLY := true
-
include $(BUILD_EXECUTABLE)
