generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove test apps from Android.mk in APM

Browse Source 
BUG=
TEST=build on android and pc platforms
Review URL: https://webrtc-codereview.appspot.com/448005

git-svn-id: http://webrtc.googlecode.com/svn/trunk@1905 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
leozwang@webrtc.org 2012-03-16 18:03:18 +00:00
parent bb966ca835
commit 9a85d8e3dd
3 changed files with 4 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
src/modules/audio_processing/Android.mk
View File

@ -59,85 +59,3 @@ ifndef NDK_ROOT
include external/stlport/libstlport.mk include external/stlport/libstlport.mk
endif endif
include $(BUILD_STATIC_LIBRARY) include $(BUILD_STATIC_LIBRARY)
# apm process test app
include $(CLEAR_VARS)
LOCAL_MODULE_TAGS := tests
LOCAL_CPP_EXTENSION := .cc
LOCAL_SRC_FILES:= \
$(call all-proto-files-under, .) \
test/process_test.cc
# Flags passed to both C and C++ files.
LOCAL_CFLAGS := \
$(MY_WEBRTC_COMMON_DEFS)
LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/include \
$(LOCAL_PATH)/../interface \
$(LOCAL_PATH)/../.. \
$(LOCAL_PATH)/../../system_wrappers/interface \
external/gtest/include
LOCAL_STATIC_LIBRARIES := \
libgtest \
libprotobuf-cpp-2.3.0-lite
LOCAL_SHARED_LIBRARIES := \
libutils \
libstlport \
libwebrtc_audio_preprocessing
LOCAL_MODULE:= webrtc_apm_process_test
ifdef NDK_ROOT
include $(BUILD_EXECUTABLE)
else
include external/stlport/libstlport.mk
include $(BUILD_NATIVE_TEST)
endif
# apm unit test app
include $(CLEAR_VARS)
LOCAL_MODULE_TAGS := tests
LOCAL_CPP_EXTENSION := .cc
LOCAL_SRC_FILES:= \
$(call all-proto-files-under, test) \
test/unit_test.cc \
../../../test/testsupport/fileutils.cc
# Flags passed to both C and C++ files.
LOCAL_CFLAGS := \
$(MY_WEBRTC_COMMON_DEFS) \
'-DWEBRTC_APM_UNIT_TEST_FIXED_PROFILE'
LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/include \
$(LOCAL_PATH)/../interface \
$(LOCAL_PATH)/../.. \
$(LOCAL_PATH)/../../../test \
$(LOCAL_PATH)/../../system_wrappers/interface \
$(LOCAL_PATH)/../../common_audio/signal_processing/include \
external/gtest/include \
external/protobuf/src
LOCAL_STATIC_LIBRARIES := \
libgtest \
libprotobuf-cpp-2.3.0-lite
LOCAL_SHARED_LIBRARIES := \
libstlport \
libwebrtc_audio_preprocessing
LOCAL_MODULE:= webrtc_apm_unit_test
ifdef NDK_ROOT
include $(BUILD_EXECUTABLE)
else
include external/stlport/libstlport.mk
include $(BUILD_NATIVE_TEST)
endif

8
src/modules/audio_processing/test/process_test.cc
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2011 The WebRTC project authors. All Rights Reserved. * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
* *
* Use of this source code is governed by a BSD-style license * Use of this source code is governed by a BSD-style license
* that can be found in the LICENSE file in the root of the source * that can be found in the LICENSE file in the root of the source
@ -21,11 +21,9 @@
#include "module_common_types.h" #include "module_common_types.h"
#include "scoped_ptr.h" #include "scoped_ptr.h"
#include "tick_util.h" #include "tick_util.h"
#ifdef WEBRTC_ANDROID
#include "external/webrtc/src/modules/audio_processing/debug.pb.h"
#else
#include "webrtc/audio_processing/debug.pb.h" #include "webrtc/audio_processing/debug.pb.h"
#endif
using webrtc::AudioFrame; using webrtc::AudioFrame;
using webrtc::AudioProcessing; using webrtc::AudioProcessing;

5
src/modules/audio_processing/test/unit_test.cc
View File

@ -20,11 +20,8 @@
#include "testsupport/fileutils.h" #include "testsupport/fileutils.h"
#include "thread_wrapper.h" #include "thread_wrapper.h"
#include "trace.h" #include "trace.h"
#ifdef WEBRTC_ANDROID
#include "external/webrtc/src/modules/audio_processing/test/unittest.pb.h"
#else
#include "webrtc/audio_processing/unittest.pb.h" #include "webrtc/audio_processing/unittest.pb.h"
#endif
#if (defined(WEBRTC_AUDIOPROC_FIXED_PROFILE)) || \ #if (defined(WEBRTC_AUDIOPROC_FIXED_PROFILE)) || \
(defined(WEBRTC_LINUX) && defined(WEBRTC_ARCH_X86_64) && !defined(NDEBUG)) (defined(WEBRTC_LINUX) && defined(WEBRTC_ARCH_X86_64) && !defined(NDEBUG))