Commit 1a90a1b2 authored by Glenn Kasten's avatar Glenn Kasten Committed by Android Git Automerger
Browse files

am 297ca210: Merge "For checkbuild, disable all Wilhelm tests in 64-bit"

* commit '297ca210':
  For checkbuild, disable all Wilhelm tests in 64-bit
parents 0ad40129 297ca210
......@@ -32,6 +32,7 @@ $(foreach file,$(test_src_files), \
$(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)) \
)
......
......@@ -33,6 +33,8 @@ LOCAL_MODULE:= BufferQueue_test
LOCAL_MODULE_PATH := $(TARGET_OUT_DATA)/nativetest
LOCAL_32_BIT_ONLY := true
include $(BUILD_EXECUTABLE)
# Build the manual test programs.
......
......@@ -22,6 +22,8 @@ endif
LOCAL_MODULE:= slesTest_recBuffQueue
LOCAL_32_BIT_ONLY := true
include $(BUILD_EXECUTABLE)
# slesTest_playFdPath
......@@ -46,6 +48,8 @@ endif
LOCAL_MODULE:= slesTest_playFdPath
LOCAL_32_BIT_ONLY := true
include $(BUILD_EXECUTABLE)
# slesTest_feedback
......@@ -73,6 +77,8 @@ LOCAL_CFLAGS += -UNDEBUG
LOCAL_MODULE:= slesTest_feedback
LOCAL_32_BIT_ONLY := true
include $(BUILD_EXECUTABLE)
# slesTest_sawtoothBufferQueue
......@@ -98,6 +104,8 @@ endif
LOCAL_MODULE:= slesTest_sawtoothBufferQueue
LOCAL_32_BIT_ONLY := true
include $(BUILD_EXECUTABLE)
# slesTest_eqFdPath
......@@ -120,6 +128,8 @@ ifeq ($(TARGET_OS),linux)
LOCAL_CFLAGS += -DXP_UNIX
endif
LOCAL_32_BIT_ONLY := true
LOCAL_MODULE:= slesTest_eqFdPath
include $(BUILD_EXECUTABLE)
......@@ -146,6 +156,8 @@ endif
LOCAL_MODULE:= slesTest_eqOutputPath
LOCAL_32_BIT_ONLY := true
include $(BUILD_EXECUTABLE)
# slesTest_bassboostPath
......@@ -170,6 +182,8 @@ endif
LOCAL_MODULE:= slesTest_bassboostPath
LOCAL_32_BIT_ONLY := true
include $(BUILD_EXECUTABLE)
# slesTest_virtualizer
......@@ -192,6 +206,8 @@ ifeq ($(TARGET_OS),linux)
LOCAL_CFLAGS += -DXP_UNIX
endif
LOCAL_32_BIT_ONLY := true
LOCAL_MODULE:= slesTest_virtualizer
include $(BUILD_EXECUTABLE)
......@@ -218,6 +234,8 @@ endif
LOCAL_MODULE:= slesTest_effectCapabilities
LOCAL_32_BIT_ONLY := true
include $(BUILD_EXECUTABLE)
# slesTest_sendToPresetReverb
......@@ -242,6 +260,8 @@ endif
LOCAL_MODULE:= slesTest_sendToPresetReverb
LOCAL_32_BIT_ONLY := true
include $(BUILD_EXECUTABLE)
# slesTest_decodeToBuffQueue
......@@ -266,6 +286,8 @@ endif
LOCAL_MODULE:= slesTest_decodeToBuffQueue
LOCAL_32_BIT_ONLY := true
include $(BUILD_EXECUTABLE)
###################
......@@ -295,6 +317,8 @@ LOCAL_CFLAGS += -UNDEBUG
LOCAL_MODULE:= slesTest_decodeAac
LOCAL_32_BIT_ONLY := true
include $(BUILD_EXECUTABLE)
#######################################
......@@ -322,4 +346,6 @@ endif
LOCAL_MODULE:= xaVideoDecoderCapabilities
LOCAL_32_BIT_ONLY := true
include $(BUILD_EXECUTABLE)
......@@ -22,6 +22,8 @@ endif
LOCAL_MODULE:= slesTest_seekTorture
LOCAL_32_BIT_ONLY := true
include $(BUILD_EXECUTABLE)
#
......@@ -46,4 +48,6 @@ endif
LOCAL_MODULE:= slesTest_playMuteSolo
LOCAL_32_BIT_ONLY := true
include $(BUILD_EXECUTABLE)
......@@ -24,6 +24,8 @@ endif
LOCAL_MODULE:= slesTest_playStates
LOCAL_32_BIT_ONLY := true
include $(BUILD_EXECUTABLE)
# slesTest_playStreamType
......@@ -50,6 +52,8 @@ endif
LOCAL_MODULE:= slesTest_playStreamType
LOCAL_32_BIT_ONLY := true
include $(BUILD_EXECUTABLE)
# slesTest_playUri
......@@ -76,6 +80,8 @@ endif
LOCAL_MODULE:= slesTest_playUri
LOCAL_32_BIT_ONLY := true
include $(BUILD_EXECUTABLE)
# slesTest_loopUri
......@@ -102,6 +108,8 @@ endif
LOCAL_MODULE:= slesTest_loopUri
LOCAL_32_BIT_ONLY := true
include $(BUILD_EXECUTABLE)
# slesTest_playUri2
......@@ -128,6 +136,8 @@ endif
LOCAL_MODULE:= slesTest_playUri2
LOCAL_32_BIT_ONLY := true
include $(BUILD_EXECUTABLE)
# slesTest_slowDownUri
......@@ -154,6 +164,8 @@ endif
LOCAL_MODULE:= slesTest_slowDownUri
LOCAL_32_BIT_ONLY := true
include $(BUILD_EXECUTABLE)
# slesTest_manyPlayers
......@@ -180,6 +192,8 @@ endif
LOCAL_MODULE:= slesTest_manyPlayers
LOCAL_32_BIT_ONLY := true
include $(BUILD_EXECUTABLE)
# slesTest_getPositionUri
......@@ -206,4 +220,6 @@ endif
LOCAL_MODULE:= slesTest_getPositionUri
LOCAL_32_BIT_ONLY := true
include $(BUILD_EXECUTABLE)
......@@ -13,6 +13,8 @@ LOCAL_CERTIFICATE := platform
LOCAL_JNI_SHARED_LIBRARIES := libnative-media-jni
LOCAL_32_BIT_ONLY := true
include $(BUILD_PACKAGE)
include $(call all-makefiles-under,$(LOCAL_PATH))
......@@ -11,5 +11,6 @@ LOCAL_CFLAGS += -UNDEBUG
LOCAL_PRELINK_MODULE := false
LOCAL_SHARED_LIBRARIES += libutils liblog libOpenMAXAL libandroid
LOCAL_32_BIT_ONLY := true
include $(BUILD_SHARED_LIBRARY)
......@@ -27,6 +27,8 @@ LOCAL_CFLAGS += -UNDEBUG
LOCAL_MODULE:= slesTest_intbufq
LOCAL_32_BIT_ONLY := true
include $(BUILD_EXECUTABLE)
# multiplay
......@@ -54,6 +56,8 @@ LOCAL_CFLAGS += -UNDEBUG
LOCAL_MODULE:= slesTest_multiplay
LOCAL_32_BIT_ONLY := true
include $(BUILD_EXECUTABLE)
# engine
......@@ -86,6 +90,8 @@ LOCAL_CFLAGS += -UNDEBUG
LOCAL_MODULE:= slesTest_engine
LOCAL_32_BIT_ONLY := true
include $(BUILD_EXECUTABLE)
# object
......@@ -118,6 +124,8 @@ LOCAL_CFLAGS += -UNDEBUG
LOCAL_MODULE:= slesTest_object
LOCAL_32_BIT_ONLY := true
include $(BUILD_EXECUTABLE)
# configbq
......@@ -145,6 +153,8 @@ LOCAL_CFLAGS += -UNDEBUG
LOCAL_MODULE:= slesTest_configbq
LOCAL_32_BIT_ONLY := true
include $(BUILD_EXECUTABLE)
# reverb
......@@ -176,6 +186,8 @@ LOCAL_CFLAGS += -UNDEBUG
LOCAL_MODULE:= slesTest_reverb
LOCAL_32_BIT_ONLY := true
include $(BUILD_EXECUTABLE)
# srcsink
......@@ -207,6 +219,8 @@ LOCAL_CFLAGS += -UNDEBUG
LOCAL_MODULE:= slesTest_srcsink
LOCAL_32_BIT_ONLY := true
include $(BUILD_EXECUTABLE)
# outputmix
......@@ -239,6 +253,8 @@ LOCAL_CFLAGS += -UNDEBUG
LOCAL_MODULE:= slesTest_outputmix
LOCAL_32_BIT_ONLY := true
include $(BUILD_EXECUTABLE)
# urimime
......@@ -270,6 +286,8 @@ LOCAL_CFLAGS += -UNDEBUG
LOCAL_MODULE:= slesTest_urimime
LOCAL_32_BIT_ONLY := true
include $(BUILD_EXECUTABLE)
# dim
......@@ -301,6 +319,8 @@ LOCAL_CFLAGS += -UNDEBUG
LOCAL_MODULE:= slesTest_dim
LOCAL_32_BIT_ONLY := true
include $(BUILD_EXECUTABLE)
# multithread
......@@ -332,6 +352,8 @@ LOCAL_CFLAGS += -UNDEBUG
LOCAL_MODULE:= slesTest_multithread
LOCAL_32_BIT_ONLY := true
include $(BUILD_EXECUTABLE)
# playbq
......@@ -367,6 +389,8 @@ LOCAL_CFLAGS += -UNDEBUG
LOCAL_MODULE:= slesTest_playbq
LOCAL_32_BIT_ONLY := true
include $(BUILD_EXECUTABLE)
# monkey
......@@ -398,6 +422,8 @@ LOCAL_CFLAGS += -UNDEBUG
LOCAL_MODULE:= slesTest_monkey
LOCAL_32_BIT_ONLY := true
include $(BUILD_EXECUTABLE)
# xa
......@@ -429,6 +455,8 @@ LOCAL_CFLAGS += -UNDEBUG
LOCAL_MODULE:= slesTest_xa
LOCAL_32_BIT_ONLY := true
include $(BUILD_EXECUTABLE)
# dual
......@@ -461,6 +489,8 @@ LOCAL_CFLAGS += -UNDEBUG
LOCAL_MODULE:= slesTest_dual
LOCAL_32_BIT_ONLY := true
include $(BUILD_EXECUTABLE)
# xaplay
......@@ -495,4 +525,6 @@ LOCAL_CFLAGS += -UNDEBUG
LOCAL_MODULE:= xaplay
LOCAL_32_BIT_ONLY := true
include $(BUILD_EXECUTABLE)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment