From 9a85d8e3dd644f01a3eda8cd2425bd5a25cf8c2a Mon Sep 17 00:00:00 2001
From: "leozwang@webrtc.org"
 <leozwang@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>
Date: Fri, 16 Mar 2012 18:03:18 +0000
Subject: [PATCH] Remove test apps from Android.mk in APM

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
---
 src/modules/audio_processing/Android.mk       | 82 -------------------
 .../audio_processing/test/process_test.cc     |  8 +-
 .../audio_processing/test/unit_test.cc        |  5 +-
 3 files changed, 4 insertions(+), 91 deletions(-)

diff --git a/src/modules/audio_processing/Android.mk b/src/modules/audio_processing/Android.mk
index 2ab5bb627..c03c1b0fc 100644
--- a/src/modules/audio_processing/Android.mk
+++ b/src/modules/audio_processing/Android.mk
@@ -59,85 +59,3 @@ ifndef NDK_ROOT
 include external/stlport/libstlport.mk
 endif
 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
diff --git a/src/modules/audio_processing/test/process_test.cc b/src/modules/audio_processing/test/process_test.cc
index 2023ddb13..d4841c721 100644
--- a/src/modules/audio_processing/test/process_test.cc
+++ b/src/modules/audio_processing/test/process_test.cc
@@ -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
  *  that can be found in the LICENSE file in the root of the source
@@ -21,11 +21,9 @@
 #include "module_common_types.h"
 #include "scoped_ptr.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"
-#endif
+
 
 using webrtc::AudioFrame;
 using webrtc::AudioProcessing;
diff --git a/src/modules/audio_processing/test/unit_test.cc b/src/modules/audio_processing/test/unit_test.cc
index f92490a6c..573fd8ddd 100644
--- a/src/modules/audio_processing/test/unit_test.cc
+++ b/src/modules/audio_processing/test/unit_test.cc
@@ -20,11 +20,8 @@
 #include "testsupport/fileutils.h"
 #include "thread_wrapper.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"
-#endif
+
 
 #if (defined(WEBRTC_AUDIOPROC_FIXED_PROFILE)) || \
     (defined(WEBRTC_LINUX) && defined(WEBRTC_ARCH_X86_64) && !defined(NDEBUG))