diff options
| author | Joshua Litt <joshualitt@google.com> | 2013-11-13 16:30:31 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-11-14 13:30:28 -0800 |
| commit | f16cde998b3c43ccda202e463b0ff72e725e9829 (patch) | |
| tree | 2849baa24521c93a807c0e7f6567c1586b65a996 /test/android/Android.mk | |
| parent | 58f754374d422b333142f9568027781c1929c8aa (diff) | |
| download | libvpx-f16cde998b3c43ccda202e463b0ff72e725e9829.tar libvpx-f16cde998b3c43ccda202e463b0ff72e725e9829.tar.gz libvpx-f16cde998b3c43ccda202e463b0ff72e725e9829.tar.bz2 libvpx-f16cde998b3c43ccda202e463b0ff72e725e9829.zip | |
Tweaks to vpx_test android make file
* Change from thumb mode to arm mode improves test time significantly
* Direct inclusion of test.mk allows for unit test configuration via
configure script
Change-Id: Id58d3ba8289374528756a672459d8334afe20e2a
Diffstat (limited to 'test/android/Android.mk')
| -rw-r--r-- | test/android/Android.mk | 33 |
1 files changed, 6 insertions, 27 deletions
diff --git a/test/android/Android.mk b/test/android/Android.mk index 8d8ce163d..13af601e2 100644 --- a/test/android/Android.mk +++ b/test/android/Android.mk @@ -10,9 +10,6 @@ # The test app itself runs on the command line through adb shell # The paths are really messed up as the libvpx make file # expects to be made from a parent directory. -# TODO(joshualitt) -# Fix android make files so they can be built from anywhere, will require -# changing the libvpx make file and this one. CUR_WD := $(call my-dir) BINDINGS_DIR := $(CUR_WD)/../../.. LOCAL_PATH := $(CUR_WD)/../../.. @@ -20,12 +17,11 @@ LOCAL_PATH := $(CUR_WD)/../../.. #libvpx include $(CLEAR_VARS) include $(BINDINGS_DIR)/libvpx/build/make/Android.mk -# Restore path -# TODO joshualitt Fix makefiles so this is no longer needed LOCAL_PATH := $(CUR_WD)/../.. #libgtest include $(CLEAR_VARS) +LOCAL_ARM_MODE := arm LOCAL_CPP_EXTENSION := .cc LOCAL_MODULE := gtest LOCAL_C_INCLUDES := $(LOCAL_PATH)/third_party/googletest/src/ @@ -33,31 +29,14 @@ LOCAL_C_INCLUDES += $(LOCAL_PATH)/third_party/googletest/src/include/ LOCAL_SRC_FILES := ./third_party/googletest/src/src/gtest-all.cc include $(BUILD_STATIC_LIBRARY) -#libnestegg -include $(CLEAR_VARS) -LOCAL_CPP_EXTENSION := .cc -LOCAL_MODULE := nestegg -NESTEGG_PATH := $(LOCAL_PATH)/nestegg -LOCAL_C_INCLUDES := $(NESTEGG_PATH)/include -LOCAL_C_INCLUDES += $(LOCAL_PATH)/ -LOCAL_C_INCLUDES += $(NESTEGG_PATH)/halloc/ -LOCAL_SRC_FILES := ./nestegg/halloc/src/halloc.c -LOCAL_SRC_FILES += ./nestegg/src/nestegg.c -include $(BUILD_STATIC_LIBRARY) - #libvpx_test include $(CLEAR_VARS) +LOCAL_ARM_MODE := arm LOCAL_MODULE := libvpx_test LOCAL_STATIC_LIBRARIES := gtest -LOCAL_STATIC_LIBRARIES += nestegg -LOCAL_STATIC_LIBRARIES += cpufeatures LOCAL_SHARED_LIBRARIES := vpx -LOCAL_C_INCLUDES := $(LOCAL_PATH)/ -LOCAL_C_INCLUDES += $(BINDINGS_DIR)/ -LOCAL_C_INCLUDES += $(LOCAL_PATH)/third_party/googletest/src/include -LOCAL_SRC_FILES := ./args.c -LOCAL_SRC_FILES += ./md5_utils.c -LOCAL_SRC_FILES += ./test/decode_test_driver.cc -LOCAL_SRC_FILES += ./test/test_libvpx.cc -LOCAL_SRC_FILES += ./test/test_vector_test.cc +include $(LOCAL_PATH)/test/test.mk +LOCAL_C_INCLUDES := $(BINDINGS_DIR) +FILTERED_SRC := $(sort $(filter %.cc %.c, $(LIBVPX_TEST_SRCS-yes))) +LOCAL_SRC_FILES := $(addprefix ./test/, $(FILTERED_SRC)) include $(BUILD_EXECUTABLE) |