Enable protobuf for apm module
Review URL: http://webrtc-codereview.appspot.com/93019
git-svn-id: http://webrtc.googlecode.com/svn/trunk@319 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/Android.mk b/Android.mk
index 6eaceae..96f1351 100644
--- a/Android.mk
+++ b/Android.mk
@@ -26,7 +26,7 @@
include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_processing/aec/main/source/Android.mk
include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_processing/aecm/main/source/Android.mk
include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_processing/agc/main/source/Android.mk
-include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_processing/main/source/Android.mk
+include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_processing/main/Android.mk
include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_processing/ns/main/source/Android.mk
include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_processing/utility/Android.mk
include $(MY_WEBRTC_ROOT_PATH)/src/modules/media_file/source/Android.mk
@@ -142,9 +142,6 @@
include $(BUILD_SHARED_LIBRARY)
# test apps, they're for test only; all these test apps have LOCAL_MODULE_TAGS:=tests
-# audio processing test apps
-include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_processing/main/test/process_test/Android.mk
-include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_processing/main/test/unit_test/Android.mk
# voice engine test apps
include $(MY_WEBRTC_ROOT_PATH)/src/voice_engine/main/test/cmd_test/Android.mk
include $(MY_WEBRTC_ROOT_PATH)/src/voice_engine/main/test/auto_test/Android.mk
diff --git a/src/modules/audio_processing/main/Android.mk b/src/modules/audio_processing/main/Android.mk
new file mode 100644
index 0000000..a23894c
--- /dev/null
+++ b/src/modules/audio_processing/main/Android.mk
@@ -0,0 +1,141 @@
+# Copyright (c) 2011 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
+# tree. An additional intellectual property rights grant can be found
+# in the file PATENTS. All contributing project authors may
+# be found in the AUTHORS file in the root of the source tree.
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+include $(LOCAL_PATH)/../../../../android-webrtc.mk
+
+LOCAL_ARM_MODE := arm
+LOCAL_MODULE := libwebrtc_apm
+LOCAL_MODULE_TAGS := optional
+LOCAL_CPP_EXTENSION := .cc
+LOCAL_SRC_FILES := \
+ $(call all-proto-files-under, source) \
+ source/audio_buffer.cc \
+ source/audio_processing_impl.cc \
+ source/echo_cancellation_impl.cc \
+ source/echo_control_mobile_impl.cc \
+ source/gain_control_impl.cc \
+ source/high_pass_filter_impl.cc \
+ source/level_estimator_impl.cc \
+ source/noise_suppression_impl.cc \
+ source/splitting_filter.cc \
+ source/processing_component.cc \
+ source/voice_detection_impl.cc
+
+# Flags passed to both C and C++ files.
+LOCAL_CFLAGS := \
+ $(MY_WEBRTC_COMMON_DEFS) \
+ '-DWEBRTC_NS_FIXED'
+# floating point
+# -DWEBRTC_NS_FLOAT'
+
+LOCAL_C_INCLUDES := \
+ $(LOCAL_PATH)/interface \
+ $(LOCAL_PATH)/../aec/main/interface \
+ $(LOCAL_PATH)/../aecm/main/interface \
+ $(LOCAL_PATH)/../agc/main/interface \
+ $(LOCAL_PATH)/../ns/main/interface \
+ $(LOCAL_PATH)/../../interface \
+ $(LOCAL_PATH)/../../.. \
+ $(LOCAL_PATH)/../../../common_audio/signal_processing_library/main/interface \
+ $(LOCAL_PATH)/../../../common_audio/vad/main/interface \
+ $(LOCAL_PATH)/../../../system_wrappers/interface \
+ external/protobuf/src
+
+LOCAL_SHARED_LIBRARIES := \
+ libcutils \
+ libdl \
+ libstlport
+
+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, source) \
+ test/process_test/process_test.cc
+
+# Flags passed to both C and C++ files.
+LOCAL_CFLAGS := \
+ $(MY_WEBRTC_COMMON_DEFS)
+
+LOCAL_C_INCLUDES := \
+ $(LOCAL_PATH)/interface \
+ $(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/unit_test) \
+ test/unit_test/unit_test.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)/interface \
+ $(LOCAL_PATH)/../../interface \
+ $(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 := \
+ 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/main/source/Android.mk b/src/modules/audio_processing/main/source/Android.mk
deleted file mode 100644
index 2ba4731..0000000
--- a/src/modules/audio_processing/main/source/Android.mk
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright (c) 2011 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
-# tree. An additional intellectual property rights grant can be found
-# in the file PATENTS. All contributing project authors may
-# be found in the AUTHORS file in the root of the source tree.
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-include $(LOCAL_PATH)/../../../../../android-webrtc.mk
-
-LOCAL_ARM_MODE := arm
-LOCAL_MODULE := libwebrtc_apm
-LOCAL_MODULE_TAGS := optional
-LOCAL_CPP_EXTENSION := .cc
-LOCAL_SRC_FILES := \
- $(call all-proto-files-under, .) \
- audio_buffer.cc \
- audio_processing_impl.cc \
- echo_cancellation_impl.cc \
- echo_control_mobile_impl.cc \
- gain_control_impl.cc \
- high_pass_filter_impl.cc \
- level_estimator_impl.cc \
- noise_suppression_impl.cc \
- splitting_filter.cc \
- processing_component.cc \
- voice_detection_impl.cc
-
-# Flags passed to both C and C++ files.
-LOCAL_CFLAGS := \
- $(MY_WEBRTC_COMMON_DEFS) \
- '-DWEBRTC_NS_FIXED'
-# floating point
-# -DWEBRTC_NS_FLOAT'
-
-LOCAL_C_INCLUDES := \
- $(LOCAL_PATH)/../interface \
- $(LOCAL_PATH)/../../aec/main/interface \
- $(LOCAL_PATH)/../../aecm/main/interface \
- $(LOCAL_PATH)/../../agc/main/interface \
- $(LOCAL_PATH)/../../ns/main/interface \
- $(LOCAL_PATH)/../../../interface \
- $(LOCAL_PATH)/../../../.. \
- $(LOCAL_PATH)/../../../../common_audio/signal_processing_library/main/interface \
- $(LOCAL_PATH)/../../../../common_audio/vad/main/interface \
- $(LOCAL_PATH)/../../../../system_wrappers/interface \
- external/protobuf/src
-
-LOCAL_SHARED_LIBRARIES := \
- libcutils \
- libdl \
- libstlport \
- libprotobuf-cpp-2.3.0-lite
-
-ifndef NDK_ROOT
-include external/stlport/libstlport.mk
-endif
-include $(BUILD_STATIC_LIBRARY)
-
diff --git a/src/modules/audio_processing/main/test/process_test/Android.mk b/src/modules/audio_processing/main/test/process_test/Android.mk
deleted file mode 100644
index bc27813..0000000
--- a/src/modules/audio_processing/main/test/process_test/Android.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright (c) 2011 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
-# tree. An additional intellectual property rights grant can be found
-# in the file PATENTS. All contributing project authors may
-# be found in the AUTHORS file in the root of the source tree.
-
-LOCAL_PATH:= $(call my-dir)
-
-# apm test app
-
-include $(CLEAR_VARS)
-
-include $(LOCAL_PATH)/../../../../../../android-webrtc.mk
-
-LOCAL_MODULE_TAGS := tests
-LOCAL_CPP_EXTENSION := .cc
-LOCAL_SRC_FILES:= \
- process_test.cc
-
-# Flags passed to both C and C++ files.
-LOCAL_CFLAGS := \
- $(MY_WEBRTC_COMMON_DEFS)
-
-LOCAL_C_INCLUDES := \
- $(LOCAL_PATH)/../../interface \
- $(LOCAL_PATH)/../../../../interface \
- $(LOCAL_PATH)/../../../../.. \
- $(LOCAL_PATH)/../../../../../system_wrappers/interface \
- external/gtest/include
-
-LOCAL_STATIC_LIBRARIES := \
- libgtest
-
-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
diff --git a/src/modules/audio_processing/main/test/process_test/process_test.cc b/src/modules/audio_processing/main/test/process_test/process_test.cc
index 72436b5..51c48e8 100644
--- a/src/modules/audio_processing/main/test/process_test/process_test.cc
+++ b/src/modules/audio_processing/main/test/process_test/process_test.cc
@@ -20,7 +20,11 @@
#include "cpu_features_wrapper.h"
#include "module_common_types.h"
#include "tick_util.h"
+#ifdef WEBRTC_ANDROID
+#include "external/webrtc/src/modules/audio_processing/main/source/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/main/test/unit_test/Android.mk b/src/modules/audio_processing/main/test/unit_test/Android.mk
deleted file mode 100644
index 65bd6ac..0000000
--- a/src/modules/audio_processing/main/test/unit_test/Android.mk
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright (c) 2011 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
-# tree. An additional intellectual property rights grant can be found
-# in the file PATENTS. All contributing project authors may
-# be found in the AUTHORS file in the root of the source tree.
-
-LOCAL_PATH:= $(call my-dir)
-
-# apm test app
-
-include $(CLEAR_VARS)
-
-include $(LOCAL_PATH)/../../../../../../android-webrtc.mk
-
-LOCAL_MODULE_TAGS := tests
-LOCAL_CPP_EXTENSION := .cc
-LOCAL_SRC_FILES:= \
- $(call all-proto-files-under, .) \
- unit_test.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)/../../interface \
- $(LOCAL_PATH)/../../../../interface \
- $(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 := \
- 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
