zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Enable unit_test for android

Browse Source 
Review URL: http://webrtc-codereview.appspot.com/95002

git-svn-id: http://webrtc.googlecode.com/svn/trunk@250 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
leozwang@google.com
2011-07-25 22:47:56 +00:00
parent a39ffa90d5
commit 3a2be19453
3 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/modules/audio_processing/main/test/unit_test/Android.mk
View File

@ -15,35 +15,33 @@ include $(CLEAR_VARS)
LOCAL_MODULE_TAGS := tests LOCAL_MODULE_TAGS := tests
LOCAL_CPP_EXTENSION := .cc LOCAL_CPP_EXTENSION := .cc
LOCAL_SRC_FILES:= \ LOCAL_SRC_FILES:= \
unit_test.cc unit_test.cc \
audio_processing_unittest_android.pb.cc
# Flags passed to both C and C++ files. # Flags passed to both C and C++ files.
LOCAL_CFLAGS := \ LOCAL_CFLAGS := \
'-DWEBRTC_TARGET_PC' \ $(MY_WEBRTC_COMMON_DEFS)
'-DWEBRTC_LINUX' \
'-DWEBRTC_THREAD_RR' \
'-DWEBRTC_ANDROID' \
'-DANDROID'
LOCAL_CPPFLAGS :=
LOCAL_LDFLAGS :=
LOCAL_C_INCLUDES := \ LOCAL_C_INCLUDES := \
external/gtest/include \
$(LOCAL_PATH)/../../../../../system_wrappers/interface \
$(LOCAL_PATH)/../../../../../common_audio/signal_processing_library/main/interface \
$(LOCAL_PATH)/../../interface \ $(LOCAL_PATH)/../../interface \
$(LOCAL_PATH)/../../../../interface \ $(LOCAL_PATH)/../../../../interface \
$(LOCAL_PATH)/../../../../.. $(LOCAL_PATH)/../../../../.. \
$(LOCAL_PATH)/../../../../../system_wrappers/interface \
$(LOCAL_PATH)/../../../../../common_audio/signal_processing_library/main/interface \
external/gtest/include \
external/protobuf/src
LOCAL_STATIC_LIBRARIES := \ LOCAL_STATIC_LIBRARIES := \
libgtest libgtest \
libprotobuf-cpp-2.3.0-lite
LOCAL_SHARED_LIBRARIES := \ LOCAL_SHARED_LIBRARIES := \
libutils \
libstlport \ libstlport \
libwebrtc_audio_preprocessing libwebrtc_audio_preprocessing
LOCAL_MODULE:= webrtc_apm_unit_test LOCAL_MODULE:= webrtc_apm_unit_test
ifndef NDK_ROOT
include external/stlport/libstlport.mk include external/stlport/libstlport.mk
endif
include $(BUILD_EXECUTABLE) include $(BUILD_EXECUTABLE)

2
src/modules/audio_processing/main/test/unit_test/audio_processing_unittest_android.pb.cc
View File

@ -1,7 +1,7 @@
// Generated by the protocol buffer compiler. DO NOT EDIT! // Generated by the protocol buffer compiler. DO NOT EDIT!
#define INTERNAL_SUPPRESS_PROTOBUF_FIELD_DEPRECATION #define INTERNAL_SUPPRESS_PROTOBUF_FIELD_DEPRECATION
#include "audio_processing_unittest.pb.h" #include "audio_processing_unittest_android.pb.h"
#include <google/protobuf/stubs/once.h> #include <google/protobuf/stubs/once.h>
#include <google/protobuf/io/coded_stream.h> #include <google/protobuf/io/coded_stream.h>
#include <google/protobuf/wire_format_lite_inl.h> #include <google/protobuf/wire_format_lite_inl.h>

4
src/modules/audio_processing/main/test/unit_test/unit_test.cc
View File

@ -13,7 +13,11 @@
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include "audio_processing.h" #include "audio_processing.h"
#ifdef WEBRTC_ANDROID
#include "audio_processing_unittest_android.pb.h"
#else
#include "audio_processing_unittest.pb.h" #include "audio_processing_unittest.pb.h"
#endif
#include "event_wrapper.h" #include "event_wrapper.h"
#include "module_common_types.h" #include "module_common_types.h"
#include "thread_wrapper.h" #include "thread_wrapper.h"