summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--common_audio/resampler/Android.mk47
-rw-r--r--common_audio/signal_processing/Android.mk126
-rw-r--r--common_audio/vad/Android.mk51
-rw-r--r--common_video/libyuv/Android.mk42
-rw-r--r--modules/audio_coding/codecs/cng/Android.mk40
-rw-r--r--modules/audio_coding/codecs/g711/Android.mk40
-rw-r--r--modules/audio_coding/codecs/g722/Android.mk40
-rw-r--r--modules/audio_coding/codecs/ilbc/Android.mk165
-rw-r--r--modules/audio_coding/codecs/isac/fix/source/Android.mk152
-rw-r--r--modules/audio_coding/codecs/isac/main/source/Android.mk66
-rw-r--r--modules/audio_coding/codecs/pcm16b/Android.mk37
-rw-r--r--modules/audio_conference_mixer/source/Android.mk44
-rw-r--r--modules/audio_device/Android.mk58
-rw-r--r--modules/audio_processing/Android.mk153
-rw-r--r--modules/audio_processing/aec/Android.mk59
-rw-r--r--modules/audio_processing/aecm/Android.mk95
-rw-r--r--modules/audio_processing/agc/Android.mk41
-rw-r--r--modules/audio_processing/ns/Android.mk95
-rw-r--r--modules/audio_processing/test/android/apmtest/jni/Android.mk26
-rw-r--r--modules/audio_processing/utility/Android.mk44
-rw-r--r--modules/media_file/source/Android.mk46
-rw-r--r--modules/rtp_rtcp/source/Android.mk67
-rw-r--r--modules/utility/source/Android.mk56
-rw-r--r--modules/video_capture/Android.mk50
-rw-r--r--modules/video_coding/codecs/i420/main/source/Android.mk41
-rw-r--r--modules/video_coding/codecs/vp8/Android.mk47
-rw-r--r--modules/video_coding/main/source/Android.mk68
-rw-r--r--modules/video_coding/utility/Android.mk39
-rw-r--r--modules/video_processing/main/source/Android.mk58
-rw-r--r--modules/video_render/Android.mk53
-rw-r--r--system_wrappers/source/Android.mk65
-rw-r--r--test/Android.mk39
-rw-r--r--video_engine/Android.mk93
-rw-r--r--video_engine/test/auto_test/android/Android.mk38
-rw-r--r--video_engine/test/auto_test/android/jni/Android.mk76
-rw-r--r--video_engine/test/auto_test/source/Android.mk64
-rw-r--r--voice_engine/Android.mk86
-rw-r--r--voice_engine/test/android/android_test/Android.mk25
-rw-r--r--voice_engine/test/android/android_test/jni/Android.mk152
-rw-r--r--voice_engine/test/auto_test/Android.mk56
-rw-r--r--voice_engine/test/cmd_test/Android.mk60
41 files changed, 0 insertions, 2700 deletions
diff --git a/common_audio/resampler/Android.mk b/common_audio/resampler/Android.mk
deleted file mode 100644
index b1d630aa..00000000
--- a/common_audio/resampler/Android.mk
+++ /dev/null
@@ -1,47 +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_CLASS := STATIC_LIBRARIES
-LOCAL_MODULE := libwebrtc_resampler
-LOCAL_MODULE_TAGS := optional
-LOCAL_CPP_EXTENSION := .cc
-LOCAL_SRC_FILES := resampler.cc
-
-# Flags passed to both C and C++ files.
-LOCAL_CFLAGS := \
- $(MY_WEBRTC_COMMON_DEFS)
-
-LOCAL_C_INCLUDES := \
- $(LOCAL_PATH)/include \
- $(LOCAL_PATH)/../.. \
- $(LOCAL_PATH)/../signal_processing/include
-
-LOCAL_SHARED_LIBRARIES := \
- libcutils \
- libdl \
- libstlport
-
-ifeq ($(TARGET_OS)-$(TARGET_SIMULATOR),linux-true)
-LOCAL_LDLIBS += -ldl -lpthread
-endif
-
-ifneq ($(TARGET_SIMULATOR),true)
-LOCAL_SHARED_LIBRARIES += libdl
-endif
-
-ifndef NDK_ROOT
-include external/stlport/libstlport.mk
-endif
-include $(BUILD_STATIC_LIBRARY)
diff --git a/common_audio/signal_processing/Android.mk b/common_audio/signal_processing/Android.mk
deleted file mode 100644
index aed7e73b..00000000
--- a/common_audio/signal_processing/Android.mk
+++ /dev/null
@@ -1,126 +0,0 @@
-# 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
-# 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_CLASS := STATIC_LIBRARIES
-LOCAL_MODULE := libwebrtc_spl
-LOCAL_MODULE_TAGS := optional
-LOCAL_SRC_FILES := \
- auto_corr_to_refl_coef.c \
- auto_correlation.c \
- complex_fft.c \
- copy_set_operations.c \
- cross_correlation.c \
- division_operations.c \
- dot_product_with_scale.c \
- downsample_fast.c \
- energy.c \
- filter_ar.c \
- filter_ma_fast_q12.c \
- get_hanning_window.c \
- get_scaling_square.c \
- ilbc_specific_functions.c \
- levinson_durbin.c \
- lpc_to_refl_coef.c \
- min_max_operations.c \
- randomization_functions.c \
- real_fft.c \
- refl_coef_to_lpc.c \
- resample.c \
- resample_48khz.c \
- resample_by_2.c \
- resample_by_2_internal.c \
- resample_fractional.c \
- spl_init.c \
- spl_sqrt.c \
- spl_version.c \
- splitting_filter.c \
- sqrt_of_one_minus_x_squared.c \
- vector_scaling_operations.c
-
-# Flags passed to both C and C++ files.
-LOCAL_CFLAGS := \
- $(MY_WEBRTC_COMMON_DEFS)
-
-LOCAL_C_INCLUDES := \
- $(LOCAL_PATH)/include \
- $(LOCAL_PATH)/../.. \
- external/webrtc
-
-ifeq ($(ARCH_ARM_HAVE_ARMV7A),true)
-LOCAL_SRC_FILES += \
- filter_ar_fast_q12_armv7.S
-else
-LOCAL_SRC_FILES += \
- filter_ar_fast_q12.c
-endif
-
-ifeq ($(TARGET_ARCH),arm)
-LOCAL_SRC_FILES += \
- complex_bit_reverse_arm.S \
- spl_sqrt_floor_arm.S
-else
-LOCAL_SRC_FILES += \
- complex_bit_reverse.c \
- spl_sqrt_floor.c
-endif
-
-LOCAL_SHARED_LIBRARIES := libstlport
-
-ifeq ($(TARGET_OS)-$(TARGET_SIMULATOR),linux-true)
-LOCAL_LDLIBS += -ldl -lpthread
-endif
-
-ifneq ($(TARGET_SIMULATOR),true)
-LOCAL_SHARED_LIBRARIES += libdl
-endif
-
-ifndef NDK_ROOT
-include external/stlport/libstlport.mk
-endif
-include $(BUILD_STATIC_LIBRARY)
-
-#########################
-# Build the neon library.
-ifeq ($(WEBRTC_BUILD_NEON_LIBS),true)
-
-include $(CLEAR_VARS)
-
-LOCAL_ARM_MODE := arm
-LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_MODULE := libwebrtc_spl_neon
-LOCAL_MODULE_TAGS := optional
-LOCAL_SRC_FILES := \
- cross_correlation_neon.S \
- downsample_fast_neon.S \
- min_max_operations_neon.S \
- vector_scaling_operations_neon.S
-
-# Flags passed to both C and C++ files.
-LOCAL_CFLAGS := \
- $(MY_WEBRTC_COMMON_DEFS) \
- $(MY_ARM_CFLAGS_NEON)
-
-LOCAL_C_INCLUDES := \
- $(LOCAL_PATH)/include \
- $(LOCAL_PATH)/../.. \
- external/webrtc
-
-ifndef NDK_ROOT
-include external/stlport/libstlport.mk
-endif
-include $(BUILD_STATIC_LIBRARY)
-
-endif # ifeq ($(WEBRTC_BUILD_NEON_LIBS),true)
-
diff --git a/common_audio/vad/Android.mk b/common_audio/vad/Android.mk
deleted file mode 100644
index ed5de6b9..00000000
--- a/common_audio/vad/Android.mk
+++ /dev/null
@@ -1,51 +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_CLASS := STATIC_LIBRARIES
-LOCAL_MODULE := libwebrtc_vad
-LOCAL_MODULE_TAGS := optional
-LOCAL_SRC_FILES := \
- webrtc_vad.c \
- vad_core.c \
- vad_filterbank.c \
- vad_gmm.c \
- vad_sp.c
-
-# Flags passed to both C and C++ files.
-LOCAL_CFLAGS := \
- $(MY_WEBRTC_COMMON_DEFS)
-
-LOCAL_C_INCLUDES := \
- $(LOCAL_PATH)/include \
- $(LOCAL_PATH)/../.. \
- $(LOCAL_PATH)/../signal_processing/include \
- external/webrtc
-
-LOCAL_SHARED_LIBRARIES := \
- libdl \
- libstlport
-
-ifeq ($(TARGET_OS)-$(TARGET_SIMULATOR),linux-true)
-LOCAL_LDLIBS += -ldl -lpthread
-endif
-
-ifneq ($(TARGET_SIMULATOR),true)
-LOCAL_SHARED_LIBRARIES += libdl
-endif
-
-ifndef NDK_ROOT
-include external/stlport/libstlport.mk
-endif
-include $(BUILD_STATIC_LIBRARY)
diff --git a/common_video/libyuv/Android.mk b/common_video/libyuv/Android.mk
deleted file mode 100644
index 90f6250d..00000000
--- a/common_video/libyuv/Android.mk
+++ /dev/null
@@ -1,42 +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_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_MODULE := libwebrtc_yuv
-LOCAL_MODULE_TAGS := optional
-LOCAL_CPP_EXTENSION := .cc
-LOCAL_SRC_FILES := \
- libyuv.cc \
- scaler.cc
-
-# Flags passed to both C and C++ files.
-LOCAL_CFLAGS := \
- $(MY_WEBRTC_COMMON_DEFS)
-
-# Include paths placed before CFLAGS/CPPFLAGS
-LOCAL_C_INCLUDES := \
- $(LOCAL_PATH)/../.. \
- $(LOCAL_PATH)/../../../.. \
- $(LOCAL_PATH)/../../../../libyuv/files/include
-
-
-LOCAL_SHARED_LIBRARIES := \
- libcutils \
- libdl \
- libstlport
-
-ifndef NDK_ROOT
-include external/stlport/libstlport.mk
-endif
-include $(BUILD_STATIC_LIBRARY) \ No newline at end of file
diff --git a/modules/audio_coding/codecs/cng/Android.mk b/modules/audio_coding/codecs/cng/Android.mk
deleted file mode 100644
index 32671ccd..00000000
--- a/modules/audio_coding/codecs/cng/Android.mk
+++ /dev/null
@@ -1,40 +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_CLASS := STATIC_LIBRARIES
-LOCAL_MODULE := libwebrtc_cng
-LOCAL_MODULE_TAGS := optional
-LOCAL_GENERATED_SOURCES :=
-LOCAL_SRC_FILES := \
- webrtc_cng.c \
- cng_helpfuns.c
-
-# Flags passed to both C and C++ files.
-LOCAL_CFLAGS := \
- $(MY_WEBRTC_COMMON_DEFS)
-
-LOCAL_C_INCLUDES := \
- $(LOCAL_PATH)/include \
- $(LOCAL_PATH)/../../../.. \
- $(LOCAL_PATH)/../../../../common_audio/signal_processing/include
-
-LOCAL_SHARED_LIBRARIES := \
- libdl \
- libstlport
-
-ifndef NDK_ROOT
-include external/stlport/libstlport.mk
-endif
-include $(BUILD_STATIC_LIBRARY)
diff --git a/modules/audio_coding/codecs/g711/Android.mk b/modules/audio_coding/codecs/g711/Android.mk
deleted file mode 100644
index 779bb7c4..00000000
--- a/modules/audio_coding/codecs/g711/Android.mk
+++ /dev/null
@@ -1,40 +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_CLASS := STATIC_LIBRARIES
-LOCAL_MODULE := libwebrtc_g711
-LOCAL_MODULE_TAGS := optional
-LOCAL_GENERATED_SOURCES :=
-LOCAL_SRC_FILES := \
- g711_interface.c \
- g711.c
-
-# Flags passed to both C and C++ files.
-LOCAL_CFLAGS := \
- $(MY_WEBRTC_COMMON_DEFS)
-
-LOCAL_C_INCLUDES := \
- $(LOCAL_PATH)/include \
- $(LOCAL_PATH)/../../../..
-
-LOCAL_SHARED_LIBRARIES := \
- libcutils \
- libdl \
- libstlport
-
-ifndef NDK_ROOT
-include external/stlport/libstlport.mk
-endif
-include $(BUILD_STATIC_LIBRARY)
diff --git a/modules/audio_coding/codecs/g722/Android.mk b/modules/audio_coding/codecs/g722/Android.mk
deleted file mode 100644
index 39dea9eb..00000000
--- a/modules/audio_coding/codecs/g722/Android.mk
+++ /dev/null
@@ -1,40 +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_CLASS := STATIC_LIBRARIES
-LOCAL_MODULE := libwebrtc_g722
-LOCAL_MODULE_TAGS := optional
-LOCAL_SRC_FILES := \
- g722_interface.c \
- g722_encode.c \
- g722_decode.c
-
-# Flags passed to both C and C++ files.
-LOCAL_CFLAGS := \
- $(MY_WEBRTC_COMMON_DEFS)
-
-LOCAL_C_INCLUDES := \
- $(LOCAL_PATH)/include \
- $(LOCAL_PATH)/../../../..
-
-LOCAL_SHARED_LIBRARIES := \
- libcutils \
- libdl \
- libstlport
-
-ifndef NDK_ROOT
-include external/stlport/libstlport.mk
-endif
-include $(BUILD_STATIC_LIBRARY)
diff --git a/modules/audio_coding/codecs/ilbc/Android.mk b/modules/audio_coding/codecs/ilbc/Android.mk
deleted file mode 100644
index cbadcab2..00000000
--- a/modules/audio_coding/codecs/ilbc/Android.mk
+++ /dev/null
@@ -1,165 +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_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_MODULE := libwebrtc_ilbc
-LOCAL_MODULE_TAGS := optional
-LOCAL_SRC_FILES := \
- abs_quant.c \
- abs_quant_loop.c \
- augmented_cb_corr.c \
- bw_expand.c \
- cb_construct.c \
- cb_mem_energy.c \
- cb_mem_energy_augmentation.c \
- cb_mem_energy_calc.c \
- cb_search.c \
- cb_search_core.c \
- cb_update_best_index.c \
- chebyshev.c \
- comp_corr.c \
- constants.c \
- create_augmented_vec.c \
- decode.c \
- decode_residual.c \
- decoder_interpolate_lsf.c \
- do_plc.c \
- encode.c \
- energy_inverse.c \
- enh_upsample.c \
- enhancer.c \
- enhancer_interface.c \
- filtered_cb_vecs.c \
- frame_classify.c \
- gain_dequant.c \
- gain_quant.c \
- get_cd_vec.c \
- get_lsp_poly.c \
- get_sync_seq.c \
- hp_input.c \
- hp_output.c \
- ilbc.c \
- index_conv_dec.c \
- index_conv_enc.c \
- init_decode.c \
- init_encode.c \
- interpolate.c \
- interpolate_samples.c \
- lpc_encode.c \
- lsf_check.c \
- lsf_interpolate_to_poly_dec.c \
- lsf_interpolate_to_poly_enc.c \
- lsf_to_lsp.c \
- lsf_to_poly.c \
- lsp_to_lsf.c \
- my_corr.c \
- nearest_neighbor.c \
- pack_bits.c \
- poly_to_lsf.c \
- poly_to_lsp.c \
- refiner.c \
- simple_interpolate_lsf.c \
- simple_lpc_analysis.c \
- simple_lsf_dequant.c \
- simple_lsf_quant.c \
- smooth.c \
- smooth_out_data.c \
- sort_sq.c \
- split_vq.c \
- state_construct.c \
- state_search.c \
- swap_bytes.c \
- unpack_bits.c \
- vq3.c \
- vq4.c \
- window32_w32.c \
- xcorr_coef.c
-
-# Flags passed to both C and C++ files.
-LOCAL_CFLAGS := \
- $(MY_WEBRTC_COMMON_DEFS)
-
-LOCAL_C_INCLUDES := \
- $(LOCAL_PATH)/interface \
- $(LOCAL_PATH)/../../../.. \
- $(LOCAL_PATH)/../../../../common_audio/signal_processing/include
-
-LOCAL_SHARED_LIBRARIES := \
- libcutils \
- libdl \
- libstlport
-
-ifndef NDK_ROOT
-include external/stlport/libstlport.mk
-endif
-include $(BUILD_STATIC_LIBRARY)
-
-
-# iLBC test app
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := tests
-LOCAL_CPP_EXTENSION := .cc
-LOCAL_SRC_FILES:= test/iLBC_test.c
-
-# Flags passed to both C and C++ files.
-LOCAL_CFLAGS := $(MY_WEBRTC_COMMON_DEFS)
-
-LOCAL_C_INCLUDES := \
- $(LOCAL_PATH)/interface \
- $(LOCAL_PATH)/../../../..
-
-LOCAL_STATIC_LIBRARIES := \
- libwebrtc_ilbc \
- libwebrtc_spl
-
-LOCAL_SHARED_LIBRARIES := \
- libutils
-
-LOCAL_MODULE:= webrtc_ilbc_test
-
-ifdef NDK_ROOT
-include $(BUILD_EXECUTABLE)
-else
-include $(BUILD_NATIVE_TEST)
-endif
-
-# iLBC_testLib test app
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := tests
-LOCAL_CPP_EXTENSION := .cc
-LOCAL_SRC_FILES:= test/iLBC_testLib.c
-
-# Flags passed to both C and C++ files.
-LOCAL_CFLAGS := $(MY_WEBRTC_COMMON_DEFS)
-
-LOCAL_C_INCLUDES := \
- $(LOCAL_PATH)/interface \
- $(LOCAL_PATH)/../../../..
-
-LOCAL_STATIC_LIBRARIES := \
- libwebrtc_ilbc \
- libwebrtc_spl
-
-LOCAL_SHARED_LIBRARIES := \
- libutils
-
-LOCAL_MODULE:= webrtc_ilbc_testLib
-
-ifdef NDK_ROOT
-include $(BUILD_EXECUTABLE)
-else
-include $(BUILD_NATIVE_TEST)
-endif
diff --git a/modules/audio_coding/codecs/isac/fix/source/Android.mk b/modules/audio_coding/codecs/isac/fix/source/Android.mk
deleted file mode 100644
index 200a7ec4..00000000
--- a/modules/audio_coding/codecs/isac/fix/source/Android.mk
+++ /dev/null
@@ -1,152 +0,0 @@
-# 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
-# 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.
-
-#############################
-# Build the non-neon library.
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-include $(LOCAL_PATH)/../../../../../../../android-webrtc.mk
-
-LOCAL_ARM_MODE := arm
-LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_MODULE := libwebrtc_isacfix
-LOCAL_MODULE_TAGS := optional
-LOCAL_SRC_FILES := \
- arith_routines.c \
- arith_routines_hist.c \
- arith_routines_logist.c \
- bandwidth_estimator.c \
- decode.c \
- decode_bwe.c \
- decode_plc.c \
- encode.c \
- entropy_coding.c \
- fft.c \
- filterbank_tables.c \
- filterbanks.c \
- filters.c \
- initialize.c \
- isacfix.c \
- lattice.c \
- lpc_masking_model.c \
- lpc_tables.c \
- pitch_estimator.c \
- pitch_filter.c \
- pitch_gain_tables.c \
- pitch_lag_tables.c \
- spectrum_ar_model_tables.c \
- transform.c
-
-ifeq ($(ARCH_ARM_HAVE_ARMV7A),true)
-# Using .S (instead of .s) extention is to include a C header file in assembly.
-LOCAL_SRC_FILES += \
- lattice_armv7.S \
- pitch_filter_armv6.S
-else
-LOCAL_SRC_FILES += \
- lattice_c.c
-endif
-
-# Flags passed to both C and C++ files.
-LOCAL_CFLAGS := \
- $(MY_WEBRTC_COMMON_DEFS)
-
-LOCAL_C_INCLUDES := \
- $(LOCAL_PATH)/../interface \
- $(LOCAL_PATH)/../../../../../.. \
- $(LOCAL_PATH)/../../../../../../common_audio/signal_processing/include
-
-LOCAL_STATIC_LIBRARIES += libwebrtc_system_wrappers
-
-LOCAL_SHARED_LIBRARIES := \
- libcutils \
- libdl \
- libstlport
-
-ifndef NDK_ROOT
-include external/stlport/libstlport.mk
-endif
-include $(BUILD_STATIC_LIBRARY)
-
-#########################
-# Build the neon library.
-ifeq ($(WEBRTC_BUILD_NEON_LIBS),true)
-
-include $(CLEAR_VARS)
-
-LOCAL_ARM_MODE := arm
-LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_MODULE := libwebrtc_isacfix_neon
-LOCAL_MODULE_TAGS := optional
-LOCAL_SRC_FILES := \
- filterbanks_neon.S \
- filters_neon.S \
- lattice_neon.S \
- lpc_masking_model_neon.S \
- transform_neon.S
-
-# Flags passed to both C and C++ files.
-LOCAL_CFLAGS := \
- $(MY_WEBRTC_COMMON_DEFS) \
- -mfpu=neon \
- -mfloat-abi=softfp \
- -flax-vector-conversions
-
-LOCAL_C_INCLUDES := \
- $(LOCAL_PATH)/../interface \
- $(LOCAL_PATH)/../../../../../.. \
- $(LOCAL_PATH)/../../../../../../common_audio/signal_processing/include
-
-
-ifndef NDK_ROOT
-include external/stlport/libstlport.mk
-endif
-include $(BUILD_STATIC_LIBRARY)
-
-endif # ifeq ($(WEBRTC_BUILD_NEON_LIBS),true)
-
-###########################
-# isac test app
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := tests
-LOCAL_CPP_EXTENSION := .cc
-LOCAL_SRC_FILES:= ../test/kenny.cc
-
-# Flags passed to both C and C++ files.
-LOCAL_CFLAGS := $(MY_WEBRTC_COMMON_DEFS)
-
-LOCAL_C_INCLUDES := \
- $(LOCAL_PATH)/../interface \
- $(LOCAL_PATH)/../../../../../..
-
-LOCAL_STATIC_LIBRARIES := \
- libwebrtc_isacfix \
- libwebrtc_spl \
- libwebrtc_system_wrappers \
- libwebrtc_test_support
-
-ifeq ($(WEBRTC_BUILD_NEON_LIBS),true)
-LOCAL_STATIC_LIBRARIES += \
- libwebrtc_isacfix_neon
-endif
-
-LOCAL_SHARED_LIBRARIES := \
- libutils
-
-LOCAL_MODULE:= webrtc_isac_test
-
-ifdef NDK_ROOT
-include $(BUILD_EXECUTABLE)
-else
-include $(BUILD_NATIVE_TEST)
-endif
diff --git a/modules/audio_coding/codecs/isac/main/source/Android.mk b/modules/audio_coding/codecs/isac/main/source/Android.mk
deleted file mode 100644
index 07b2a314..00000000
--- a/modules/audio_coding/codecs/isac/main/source/Android.mk
+++ /dev/null
@@ -1,66 +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_CLASS := STATIC_LIBRARIES
-LOCAL_MODULE := libwebrtc_isac
-LOCAL_MODULE_TAGS := optional
-LOCAL_SRC_FILES := \
- arith_routines.c \
- arith_routines_hist.c \
- arith_routines_logist.c \
- bandwidth_estimator.c \
- crc.c \
- decode.c \
- decode_bwe.c \
- encode.c \
- encode_lpc_swb.c \
- entropy_coding.c \
- fft.c \
- filter_functions.c \
- filterbank_tables.c \
- intialize.c \
- isac.c \
- filterbanks.c \
- pitch_lag_tables.c \
- lattice.c \
- lpc_gain_swb_tables.c \
- lpc_analysis.c \
- lpc_shape_swb12_tables.c \
- lpc_shape_swb16_tables.c \
- lpc_tables.c \
- pitch_estimator.c \
- pitch_filter.c \
- pitch_gain_tables.c \
- spectrum_ar_model_tables.c \
- transform.c
-
-# Flags passed to both C and C++ files.
-LOCAL_CFLAGS := \
- $(MY_WEBRTC_COMMON_DEFS)
-
-LOCAL_C_INCLUDES := \
- $(LOCAL_PATH)/../interface \
- $(LOCAL_PATH)/../../../../../.. \
- $(LOCAL_PATH)/../../../../../../common_audio/signal_processing/include
-
-LOCAL_SHARED_LIBRARIES := \
- libcutils \
- libdl \
- libstlport
-
-ifndef NDK_ROOT
-include external/stlport/libstlport.mk
-endif
-include $(BUILD_STATIC_LIBRARY)
diff --git a/modules/audio_coding/codecs/pcm16b/Android.mk b/modules/audio_coding/codecs/pcm16b/Android.mk
deleted file mode 100644
index 2e88fa60..00000000
--- a/modules/audio_coding/codecs/pcm16b/Android.mk
+++ /dev/null
@@ -1,37 +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_CLASS := STATIC_LIBRARIES
-LOCAL_MODULE := libwebrtc_pcm16b
-LOCAL_MODULE_TAGS := optional
-LOCAL_SRC_FILES := pcm16b.c
-
-# Flags passed to both C and C++ files.
-LOCAL_CFLAGS := \
- $(MY_WEBRTC_COMMON_DEFS)
-
-LOCAL_C_INCLUDES := \
- $(LOCAL_PATH)/include \
- $(LOCAL_PATH)/../../../..
-
-LOCAL_SHARED_LIBRARIES := \
- libcutils \
- libdl \
- libstlport
-
-ifndef NDK_ROOT
-include external/stlport/libstlport.mk
-endif
-include $(BUILD_STATIC_LIBRARY)
diff --git a/modules/audio_conference_mixer/source/Android.mk b/modules/audio_conference_mixer/source/Android.mk
deleted file mode 100644
index a90ff1dc..00000000
--- a/modules/audio_conference_mixer/source/Android.mk
+++ /dev/null
@@ -1,44 +0,0 @@
-# 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
-# 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_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_MODULE := libwebrtc_audio_conference_mixer
-LOCAL_MODULE_TAGS := optional
-LOCAL_CPP_EXTENSION := .cc
-LOCAL_SRC_FILES := \
- audio_frame_manipulator.cc \
- level_indicator.cc \
- audio_conference_mixer_impl.cc \
- time_scheduler.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)/../../audio_processing/include \
- $(LOCAL_PATH)/../../.. \
- $(LOCAL_PATH)/../../../system_wrappers/interface
-
-LOCAL_SHARED_LIBRARIES := \
- libcutils \
- libdl \
- libstlport
-
-ifndef NDK_ROOT
-include external/stlport/libstlport.mk
-endif
-include $(BUILD_STATIC_LIBRARY)
diff --git a/modules/audio_device/Android.mk b/modules/audio_device/Android.mk
deleted file mode 100644
index 4b3b9124..00000000
--- a/modules/audio_device/Android.mk
+++ /dev/null
@@ -1,58 +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_CLASS := STATIC_LIBRARIES
-LOCAL_MODULE := libwebrtc_audio_device
-LOCAL_MODULE_TAGS := optional
-LOCAL_CPP_EXTENSION := .cc
-LOCAL_SRC_FILES := \
- audio_device_buffer.cc \
- audio_device_generic.cc \
- audio_device_utility.cc \
- audio_device_impl.cc \
- android/audio_device_android_opensles.cc \
- android/audio_device_utility_android.cc \
- dummy/audio_device_utility_dummy.cc \
- dummy/audio_device_dummy.cc \
- dummy/file_audio_device.cc
-
-# Flags passed to both C and C++ files.
-LOCAL_CFLAGS := \
- $(MY_WEBRTC_COMMON_DEFS) \
- '-DWEBRTC_ANDROID_OPENSLES'
-
-LOCAL_C_INCLUDES := \
- $(LOCAL_PATH) \
- $(LOCAL_PATH)/android \
- $(LOCAL_PATH)/dummy \
- $(LOCAL_PATH)/linux \
- $(LOCAL_PATH)/../interface \
- $(LOCAL_PATH)/../../../.. \
- $(LOCAL_PATH)/../../../interface \
- $(LOCAL_PATH)/../../../../common_audio/resampler/include \
- $(LOCAL_PATH)/../../../../common_audio/signal_processing/include \
- $(LOCAL_PATH)/../../../../system_wrappers/interface \
- system/media/wilhelm/include
-
-LOCAL_SHARED_LIBRARIES := \
- libcutils \
- libdl \
- libstlport \
- libOpenSLES
-
-ifndef NDK_ROOT
-include external/stlport/libstlport.mk
-endif
-include $(BUILD_STATIC_LIBRARY)
diff --git a/modules/audio_processing/Android.mk b/modules/audio_processing/Android.mk
deleted file mode 100644
index 32739081..00000000
--- a/modules/audio_processing/Android.mk
+++ /dev/null
@@ -1,153 +0,0 @@
-# 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
-# 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' \
- '-DWEBRTC_ANDROID_PLATFORM_BUILD' \
- '-DWEBRTC_AUDIOPROC_DEBUG_DUMP'
-# floating point
-# -DWEBRTC_NS_FLOAT'
-
-LOCAL_C_INCLUDES := \
- $(LOCAL_PATH)/include \
- $(LOCAL_PATH)/aec/include \
- $(LOCAL_PATH)/aecm/include \
- $(LOCAL_PATH)/agc/include \
- $(LOCAL_PATH)/ns/include \
- $(LOCAL_PATH)/../interface \
- $(LOCAL_PATH)/../.. \
- $(LOCAL_PATH)/../../common_audio/signal_processing/include \
- $(LOCAL_PATH)/../../common_audio/vad/include \
- $(LOCAL_PATH)/../../system_wrappers/interface \
- external/protobuf/src \
- external/webrtc
-
-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, .) \
- test/process_test.cc
-
-# Flags passed to both C and C++ files.
-LOCAL_CFLAGS := \
- $(MY_WEBRTC_COMMON_DEFS) \
- '-DWEBRTC_ANDROID_PLATFORM_BUILD' \
- '-DWEBRTC_AUDIOPROC_DEBUG_DUMP'
-
-LOCAL_C_INCLUDES := \
- $(LOCAL_PATH)/include \
- $(LOCAL_PATH)/../interface \
- $(LOCAL_PATH)/../.. \
- $(LOCAL_PATH)/../../system_wrappers/interface \
- external/gtest/include \
- external/webrtc
-
-LOCAL_STATIC_LIBRARIES := \
- libgtest \
- libwebrtc_test_support \
- libprotobuf-cpp-2.3.0-lite
-
-LOCAL_SHARED_LIBRARIES := \
- libutils \
- libstlport \
- libwebrtc_audio_preprocessing
-
-LOCAL_MODULE:= webrtc_audioproc
-
-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/audio_processing_unittest.cc
-
-# Flags passed to both C and C++ files.
-LOCAL_CFLAGS := \
- $(MY_WEBRTC_COMMON_DEFS) \
- '-DWEBRTC_AUDIOPROC_FIXED_PROFILE' \
- '-DWEBRTC_ANDROID_PLATFORM_BUILD' \
- '-DWEBRTC_AUDIOPROC_DEBUG_DUMP'
-
-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 \
- external/webrtc
-
-LOCAL_STATIC_LIBRARIES := \
- libgtest \
- libwebrtc_test_support \
- libprotobuf-cpp-2.3.0-lite
-
-LOCAL_SHARED_LIBRARIES := \
- libstlport \
- libwebrtc_audio_preprocessing
-
-LOCAL_MODULE:= webrtc_audioproc_unittest
-
-ifdef NDK_ROOT
-include $(BUILD_EXECUTABLE)
-else
-include external/stlport/libstlport.mk
-include $(BUILD_NATIVE_TEST)
-endif
diff --git a/modules/audio_processing/aec/Android.mk b/modules/audio_processing/aec/Android.mk
deleted file mode 100644
index b86ef5f9..00000000
--- a/modules/audio_processing/aec/Android.mk
+++ /dev/null
@@ -1,59 +0,0 @@
-# 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
-# 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_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_MODULE := libwebrtc_aec
-LOCAL_MODULE_TAGS := optional
-LOCAL_SRC_FILES := \
- echo_cancellation.c \
- aec_resampler.c \
- aec_core.c \
- aec_rdft.c \
-
-ifeq ($(TARGET_ARCH),x86)
-LOCAL_SRC_FILES += \
- aec_core_sse2.c \
- aec_rdft_sse2.c
-endif
-
-# Flags passed to both C and C++ files.
-LOCAL_CFLAGS := \
- $(MY_WEBRTC_COMMON_DEFS)
-
-LOCAL_C_INCLUDES := \
- $(LOCAL_PATH)/include \
- $(LOCAL_PATH)/../utility \
- $(LOCAL_PATH)/../../.. \
- $(LOCAL_PATH)/../../../common_audio/signal_processing/include \
- external/webrtc
-
-LOCAL_SHARED_LIBRARIES := \
- libcutils \
- libdl \
- libstlport
-
-ifndef NDK_ROOT
-include external/stlport/libstlport.mk
-endif
-include $(BUILD_STATIC_LIBRARY)
-
-#########################
-# Build the neon library.
-ifeq ($(WEBRTC_BUILD_NEON_LIBS),true)
-
-LOCAL_SRC_FILES += \
- aec_core_neon.c \
- aec_rdft_neon.c
-
-endif # ifeq ($(WEBRTC_BUILD_NEON_LIBS),true)
diff --git a/modules/audio_processing/aecm/Android.mk b/modules/audio_processing/aecm/Android.mk
deleted file mode 100644
index fc11383a..00000000
--- a/modules/audio_processing/aecm/Android.mk
+++ /dev/null
@@ -1,95 +0,0 @@
-# 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
-# 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.
-
-#############################
-# Build the non-neon library.
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-include $(LOCAL_PATH)/../../../../android-webrtc.mk
-
-LOCAL_ARM_MODE := arm
-LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_MODULE := libwebrtc_aecm
-LOCAL_MODULE_TAGS := optional
-LOCAL_SRC_FILES := \
- echo_control_mobile.c \
- aecm_core.c
-
-# Flags passed to both C and C++ files.
-LOCAL_CFLAGS := $(MY_WEBRTC_COMMON_DEFS)
-
-LOCAL_C_INCLUDES := \
- $(LOCAL_PATH)/include \
- $(LOCAL_PATH)/../utility \
- $(LOCAL_PATH)/../../.. \
- $(LOCAL_PATH)/../../../common_audio/signal_processing/include \
- $(LOCAL_PATH)/../../../system_wrappers/interface \
- external/webrtc
-
-LOCAL_STATIC_LIBRARIES += libwebrtc_system_wrappers
-
-LOCAL_SHARED_LIBRARIES := \
- libcutils \
- libdl \
- libstlport
-
-ifndef NDK_ROOT
-include external/stlport/libstlport.mk
-endif
-include $(BUILD_STATIC_LIBRARY)
-
-#########################
-# Build the neon library.
-ifeq ($(WEBRTC_BUILD_NEON_LIBS),true)
-
-include $(CLEAR_VARS)
-
-LOCAL_ARM_MODE := arm
-LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_MODULE := libwebrtc_aecm_neon
-LOCAL_MODULE_TAGS := optional
-
-AECM_ASM_HEADER := $(intermediates)/aecm_core_neon_offsets.h
-AECM_ASM_HEADER_DIR := $(intermediates)
-
-# Generate a header file aecm_core_neon_offsets.h which will be included in
-# assembly file aecm_core_neon.S, from file aecm_core_neon_offsets.c.
-$(AECM_ASM_HEADER): $(LOCAL_PATH)/../../../build/generate_asm_header.py \
- $(LOCAL_PATH)/aecm_core_neon_offsets.c
- @python $^ --compiler=$(TARGET_CC) --options="$(addprefix -I, \
- $(LOCAL_INCLUDES)) $(addprefix -isystem , $(TARGET_C_INCLUDES)) -S" \
- --dir=$(AECM_ASM_HEADER_DIR)
-
-LOCAL_GENERATED_SOURCES := $(AECM_ASM_HEADER)
-LOCAL_SRC_FILES := aecm_core_neon.S
-
-# Flags passed to both C and C++ files.
-LOCAL_CFLAGS := \
- $(MY_WEBRTC_COMMON_DEFS) \
- -mfpu=neon \
- -mfloat-abi=softfp \
- -flax-vector-conversions
-
-LOCAL_C_INCLUDES := \
- $(AECM_ASM_HEADER_DIR) \
- $(LOCAL_PATH)/include \
- $(LOCAL_PATH)/../../.. \
- $(LOCAL_PATH)/../../../common_audio/signal_processing/include \
- external/webrtc
-
-LOCAL_INCLUDES := $(LOCAL_C_INCLUDES)
-
-ifndef NDK_ROOT
-include external/stlport/libstlport.mk
-endif
-include $(BUILD_STATIC_LIBRARY)
-
-endif # ifeq ($(WEBRTC_BUILD_NEON_LIBS),true)
diff --git a/modules/audio_processing/agc/Android.mk b/modules/audio_processing/agc/Android.mk
deleted file mode 100644
index 35a71365..00000000
--- a/modules/audio_processing/agc/Android.mk
+++ /dev/null
@@ -1,41 +0,0 @@
-# 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
-# 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_CLASS := STATIC_LIBRARIES
-LOCAL_MODULE := libwebrtc_agc
-LOCAL_MODULE_TAGS := optional
-LOCAL_SRC_FILES := \
- analog_agc.c \
- digital_agc.c
-
-# Flags passed to both C and C++ files.
-LOCAL_CFLAGS := \
- $(MY_WEBRTC_COMMON_DEFS)
-
-LOCAL_C_INCLUDES := \
- $(LOCAL_PATH)/include \
- $(LOCAL_PATH)/../../.. \
- $(LOCAL_PATH)/../../../common_audio/signal_processing/include \
- external/webrtc
-
-LOCAL_SHARED_LIBRARIES := \
- libcutils \
- libdl \
- libstlport
-
-ifndef NDK_ROOT
-include external/stlport/libstlport.mk
-endif
-include $(BUILD_STATIC_LIBRARY)
diff --git a/modules/audio_processing/ns/Android.mk b/modules/audio_processing/ns/Android.mk
deleted file mode 100644
index 70e33762..00000000
--- a/modules/audio_processing/ns/Android.mk
+++ /dev/null
@@ -1,95 +0,0 @@
-# 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
-# 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.
-
-#############################
-# Build the non-neon library.
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-include $(LOCAL_PATH)/../../../../android-webrtc.mk
-
-LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_MODULE := libwebrtc_ns
-LOCAL_MODULE_TAGS := optional
-LOCAL_GENERATED_SOURCES :=
-LOCAL_SRC_FILES := \
- noise_suppression_x.c \
- nsx_core.c
-
-# Files for floating point.
-# noise_suppression.c ns_core.c
-
-# Flags passed to both C and C++ files.
-LOCAL_CFLAGS := $(MY_WEBRTC_COMMON_DEFS)
-
-LOCAL_C_INCLUDES := \
- $(LOCAL_PATH)/include \
- $(LOCAL_PATH)/../utility \
- $(LOCAL_PATH)/../../.. \
- $(LOCAL_PATH)/../../../common_audio/signal_processing/include \
- $(LOCAL_PATH)/../../../system_wrappers/interface \
- external/webrtc
-
-LOCAL_STATIC_LIBRARIES += libwebrtc_system_wrappers
-
-LOCAL_SHARED_LIBRARIES := \
- libcutils \
- libdl \
- libstlport
-
-ifndef NDK_ROOT
-include external/stlport/libstlport.mk
-endif
-include $(BUILD_STATIC_LIBRARY)
-
-#############################
-# Build the neon library.
-ifeq ($(WEBRTC_BUILD_NEON_LIBS),true)
-
-include $(CLEAR_VARS)
-
-LOCAL_ARM_MODE := arm
-LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_MODULE := libwebrtc_ns_neon
-LOCAL_MODULE_TAGS := optional
-NS_ASM_HEADER := $(intermediates)/ns_core_neon_offsets.h
-NS_ASM_HEADER_DIR := $(intermediates)
-
-# Generate a header file nsx_core_neon_offsets.h which will be included in
-# assembly file nsx_core_neon.S, from file nsx_core_neon_offsets.c.
-$(NS_ASM_HEADER): $(LOCAL_PATH)/../../../build/generate_asm_header.py \
- $(LOCAL_PATH)/nsx_core_neon_offsets.c
- @python $^ --compiler=$(TARGET_CC) --options="$(addprefix -I, \
- $(LOCAL_INCLUDES)) $(addprefix -isystem , $(TARGET_C_INCLUDES)) -S" \
- --dir=$(NS_ASM_HEADER_DIR)
-
-LOCAL_GENERATED_SOURCES := $(NS_ASM_HEADER)
-LOCAL_SRC_FILES := nsx_core_neon.S
-
-# Flags passed to both C and C++ files.
-LOCAL_CFLAGS := \
- $(MY_WEBRTC_COMMON_DEFS) \
- -mfpu=neon \
- -mfloat-abi=softfp \
- -flax-vector-conversions
-
-LOCAL_C_INCLUDES := \
- $(NS_ASM_HEADER_DIR) \
- $(LOCAL_PATH)/include \
- $(LOCAL_PATH)/../../.. \
- $(LOCAL_PATH)/../../../common_audio/signal_processing/include \
- external/webrtc
-
-LOCAL_INCLUDES := $(LOCAL_C_INCLUDES)
-
-ifndef NDK_ROOT
-include external/stlport/libstlport.mk
-endif
-include $(BUILD_STATIC_LIBRARY)
-endif # ifeq ($(WEBRTC_BUILD_NEON_LIBS),true)
diff --git a/modules/audio_processing/test/android/apmtest/jni/Android.mk b/modules/audio_processing/test/android/apmtest/jni/Android.mk
deleted file mode 100644
index eaf3c9d8..00000000
--- a/modules/audio_processing/test/android/apmtest/jni/Android.mk
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright (C) 2010 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := apmtest-activity
-LOCAL_SRC_FILES := main.c
-LOCAL_LDLIBS := -llog -landroid -lEGL -lGLESv1_CM
-LOCAL_STATIC_LIBRARIES := android_native_app_glue
-
-include $(BUILD_SHARED_LIBRARY)
-
-$(call import-module,android/native_app_glue)
diff --git a/modules/audio_processing/utility/Android.mk b/modules/audio_processing/utility/Android.mk
deleted file mode 100644
index 5a4d309d..00000000
--- a/modules/audio_processing/utility/Android.mk
+++ /dev/null
@@ -1,44 +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_CLASS := STATIC_LIBRARIES
-LOCAL_MODULE := libwebrtc_apm_utility
-LOCAL_MODULE_TAGS := optional
-LOCAL_SRC_FILES := \
- fft4g.c \
- ring_buffer.c \
- delay_estimator.c \
- delay_estimator_wrapper.c
-
-# Flags passed to both C and C++ files.
-LOCAL_CFLAGS := \
- $(MY_WEBRTC_COMMON_DEFS)
-
-# Include paths placed before CFLAGS/CPPFLAGS
-LOCAL_C_INCLUDES := \
- $(LOCAL_PATH) \
- $(LOCAL_PATH)/../../.. \
- $(LOCAL_PATH)/../../../common_audio/signal_processing/include \
- external/webrtc
-
-LOCAL_SHARED_LIBRARIES := \
- libcutils \
- libdl \
- libstlport
-
-ifndef NDK_ROOT
-include external/stlport/libstlport.mk
-endif
-include $(BUILD_STATIC_LIBRARY)
diff --git a/modules/media_file/source/Android.mk b/modules/media_file/source/Android.mk
deleted file mode 100644
index 2c408c81..00000000
--- a/modules/media_file/source/Android.mk
+++ /dev/null
@@ -1,46 +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_CLASS := STATIC_LIBRARIES
-LOCAL_MODULE := libwebrtc_media_file
-LOCAL_MODULE_TAGS := optional
-LOCAL_CPP_EXTENSION := .cc
-LOCAL_SRC_FILES := \
- avi_file.cc \
- media_file_impl.cc \
- media_file_utility.cc
-
-# Flags passed to both C and C++ files.
-LOCAL_CFLAGS := \
- $(MY_WEBRTC_COMMON_DEFS) \
- '-DWEBRTC_MODULE_UTILITY_VIDEO'
-
-LOCAL_C_INCLUDES := \
- $(LOCAL_PATH)/../interface \
- $(LOCAL_PATH)/../../.. \
- $(LOCAL_PATH)/../../interface \
- $(LOCAL_PATH)/../../utility/interface \
- $(LOCAL_PATH)/../../audio_coding/main/interface \
- $(LOCAL_PATH)/../../../system_wrappers/interface
-
-LOCAL_SHARED_LIBRARIES := \
- libcutils \
- libdl \
- libstlport
-
-ifndef NDK_ROOT
-include external/stlport/libstlport.mk
-endif
-include $(BUILD_STATIC_LIBRARY)
diff --git a/modules/rtp_rtcp/source/Android.mk b/modules/rtp_rtcp/source/Android.mk
deleted file mode 100644
index 68295be7..00000000
--- a/modules/rtp_rtcp/source/Android.mk
+++ /dev/null
@@ -1,67 +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_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_MODULE := libwebrtc_rtp_rtcp
-LOCAL_MODULE_TAGS := optional
-LOCAL_CPP_EXTENSION := .cc
-LOCAL_GENERATED_SOURCES :=
-LOCAL_SRC_FILES := \
- bitrate.cc \
- rtp_rtcp_impl.cc \
- rtcp_receiver.cc \
- rtcp_receiver_help.cc \
- rtcp_sender.cc \
- rtcp_utility.cc \
- rtp_receiver.cc \
- rtp_sender.cc \
- rtp_utility.cc \
- rtp_header_extension.cc \
- ssrc_database.cc \
- tmmbr_help.cc \
- dtmf_queue.cc \
- rtp_receiver_audio.cc \
- rtp_sender_audio.cc \
- bandwidth_management.cc \
- forward_error_correction.cc \
- forward_error_correction_internal.cc \
- overuse_detector.cc \
- remote_rate_control.cc \
- rtp_packet_history.cc \
- receiver_fec.cc \
- rtp_receiver_video.cc \
- rtp_sender_video.cc \
- rtp_format_vp8.cc \
- transmission_bucket.cc \
- vp8_partition_aggregator.cc
-
-# Flags passed to both C and C++ files.
-LOCAL_CFLAGS := \
- $(MY_WEBRTC_COMMON_DEFS)
-
-LOCAL_C_INCLUDES := \
- $(LOCAL_PATH)/../interface \
- $(LOCAL_PATH)/../../.. \
- $(LOCAL_PATH)/../../interface \
- $(LOCAL_PATH)/../../../system_wrappers/interface
-
-LOCAL_SHARED_LIBRARIES := \
- libcutils \
- libdl \
- libstlport
-
-ifndef NDK_ROOT
-include external/stlport/libstlport.mk
-endif
-include $(BUILD_STATIC_LIBRARY)
diff --git a/modules/utility/source/Android.mk b/modules/utility/source/Android.mk
deleted file mode 100644
index 929bd7ce..00000000
--- a/modules/utility/source/Android.mk
+++ /dev/null
@@ -1,56 +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_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_MODULE := libwebrtc_utility
-LOCAL_MODULE_TAGS := optional
-LOCAL_CPP_EXTENSION := .cc
-LOCAL_SRC_FILES := coder.cc \
- file_player_impl.cc \
- file_recorder_impl.cc \
- process_thread_impl.cc \
- rtp_dump_impl.cc \
- frame_scaler.cc \
- video_coder.cc \
- video_frames_queue.cc
-
-# Flags passed to both C and C++ files.
-LOCAL_CFLAGS := \
- $(MY_WEBRTC_COMMON_DEFS) \
- '-DWEBRTC_MODULE_UTILITY_VIDEO'
-
-LOCAL_C_INCLUDES := \
- $(LOCAL_PATH)/../interface \
- $(LOCAL_PATH)/../../interface \
- $(LOCAL_PATH)/../../audio_coding/main/interface \
- $(LOCAL_PATH)/../../media_file/interface \
- $(LOCAL_PATH)/../../video_coding/main/interface \
- $(LOCAL_PATH)/../../video_coding/codecs/interface \
- $(LOCAL_PATH)/../../.. \
- $(LOCAL_PATH)/../../../common_video/vplib/main/interface \
- $(LOCAL_PATH)/../../../common_audio/resampler/include \
- $(LOCAL_PATH)/../../../system_wrappers/interface \
- external/webrtc
-
-LOCAL_SHARED_LIBRARIES := \
- libcutils \
- libdl \
- libstlport
-
-ifndef NDK_ROOT
-include external/stlport/libstlport.mk
-endif
-include $(BUILD_STATIC_LIBRARY)
-
-
diff --git a/modules/video_capture/Android.mk b/modules/video_capture/Android.mk
deleted file mode 100644
index 971f282b..00000000
--- a/modules/video_capture/Android.mk
+++ /dev/null
@@ -1,50 +0,0 @@
-# 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
-# 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_CLASS := STATIC_LIBRARIES
-LOCAL_MODULE := libwebrtc_video_capture
-LOCAL_MODULE_TAGS := optional
-LOCAL_CPP_EXTENSION := .cc
-LOCAL_SRC_FILES := \
- video_capture_impl.cc \
- device_info_impl.cc \
- video_capture_factory.cc \
- android/video_capture_android.cc \
- android/device_info_android.cc
-
-# Flags passed to both C and C++ files.
-LOCAL_CFLAGS := \
- $(MY_WEBRTC_COMMON_DEFS)
-
-LOCAL_C_INCLUDES := \
- $(LOCAL_PATH)/android \
- $(LOCAL_PATH)/../interface \
- $(LOCAL_PATH)/../source \
- $(LOCAL_PATH)/../../../interface \
- $(LOCAL_PATH)/../../../utility/interface \
- $(LOCAL_PATH)/../../../audio_coding/main/interface \
- $(LOCAL_PATH)/../../../.. \
- $(LOCAL_PATH)/../../../../common_video/vplib/main/interface \
- $(LOCAL_PATH)/../../../../system_wrappers/interface
-
-LOCAL_SHARED_LIBRARIES := \
- libcutils \
- libdl \
- libstlport
-
-ifndef NDK_ROOT
-include external/stlport/libstlport.mk
-endif
-include $(BUILD_STATIC_LIBRARY)
diff --git a/modules/video_coding/codecs/i420/main/source/Android.mk b/modules/video_coding/codecs/i420/main/source/Android.mk
deleted file mode 100644
index d73e77d2..00000000
--- a/modules/video_coding/codecs/i420/main/source/Android.mk
+++ /dev/null
@@ -1,41 +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_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_MODULE := libwebrtc_i420
-LOCAL_MODULE_TAGS := optional
-LOCAL_CPP_EXTENSION := .cc
-LOCAL_SRC_FILES := i420.cc
-
-# Flags passed to both C and C++ files.
-LOCAL_CFLAGS := \
- $(MY_WEBRTC_COMMON_DEFS)
-
-# Include paths placed before CFLAGS/CPPFLAGS
-LOCAL_C_INCLUDES := \
- $(LOCAL_PATH)/../interface \
- $(LOCAL_PATH)/../../../interface \
- $(LOCAL_PATH)/../../../../../.. \
- $(LOCAL_PATH)/../../../../../../common_video/interface \
- $(LOCAL_PATH)/../../../../../../system_wrappers/interface
-
-LOCAL_SHARED_LIBRARIES := \
- libcutils \
- libdl \
- libstlport
-
-ifndef NDK_ROOT
-include external/stlport/libstlport.mk
-endif
-include $(BUILD_STATIC_LIBRARY)
diff --git a/modules/video_coding/codecs/vp8/Android.mk b/modules/video_coding/codecs/vp8/Android.mk
deleted file mode 100644
index 7db37ec7..00000000
--- a/modules/video_coding/codecs/vp8/Android.mk
+++ /dev/null
@@ -1,47 +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_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_MODULE := libwebrtc_vp8
-LOCAL_MODULE_TAGS := optional
-LOCAL_CPP_EXTENSION := .cc
-LOCAL_SRC_FILES := \
- reference_picture_selection.cc \
- vp8_impl.cc
-
-# Flags passed to both C and C++ files.
-LOCAL_CFLAGS := \
- $(MY_WEBRTC_COMMON_DEFS)
-# TODO(leozwang) Enable WEBRTC_LIBVPX_VERSION after libvpx is updateed
-# to a new version and also add temporal_layers.cc
-
-LOCAL_C_INCLUDES := \
- $(LOCAL_PATH)/../interface \
- $(LOCAL_PATH)/../../../interface \
- $(LOCAL_PATH)/../../../../../.. \
- $(LOCAL_PATH)/../../../../../../common_video/interface \
- $(LOCAL_PATH)/../../../../../../common_video/vplib/main/interface \
- $(LOCAL_PATH)/../../../../../../modules/interface \
- $(LOCAL_PATH)/../../../../../../system_wrappers/interface \
- external/libvpx
-
-LOCAL_SHARED_LIBRARIES := \
- libcutils \
- libdl \
- libstlport
-
-ifndef NDK_ROOT
-include external/stlport/libstlport.mk
-endif
-include $(BUILD_STATIC_LIBRARY)
diff --git a/modules/video_coding/main/source/Android.mk b/modules/video_coding/main/source/Android.mk
deleted file mode 100644
index a8cf2d0e..00000000
--- a/modules/video_coding/main/source/Android.mk
+++ /dev/null
@@ -1,68 +0,0 @@
-# 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
-# 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_CLASS := STATIC_LIBRARIES
-LOCAL_MODULE := libwebrtc_video_coding
-LOCAL_MODULE_TAGS := optional
-LOCAL_CPP_EXTENSION := .cc
-LOCAL_SRC_FILES := \
- codec_database.cc \
- codec_timer.cc \
- content_metrics_processing.cc \
- decoding_state.cc \
- encoded_frame.cc \
- frame_buffer.cc \
- generic_decoder.cc \
- generic_encoder.cc \
- inter_frame_delay.cc \
- jitter_buffer.cc \
- jitter_buffer_common.cc \
- jitter_estimator.cc \
- media_opt_util.cc \
- media_optimization.cc \
- packet.cc \
- qm_select.cc \
- receiver.cc \
- rtt_filter.cc \
- session_info.cc \
- timestamp_map.cc \
- timing.cc \
- video_coding_impl.cc
-
-# Flags passed to both C and C++ files.
-LOCAL_CFLAGS := \
- $(MY_WEBRTC_COMMON_DEFS)
-
-LOCAL_C_INCLUDES := \
- $(LOCAL_PATH)/../interface \
- $(LOCAL_PATH)/../../codecs/interface \
- $(LOCAL_PATH)/../../codecs/i420/main/interface \
- $(LOCAL_PATH)/../../codecs/vp8/main/interface \
- $(LOCAL_PATH)/../../../interface \
- $(LOCAL_PATH)/../../../.. \
- $(LOCAL_PATH)/../../../../common_video/vplib/main/interface \
- $(LOCAL_PATH)/../../../../common_video/interface \
- $(LOCAL_PATH)/../../utility/include \
- $(LOCAL_PATH)/../../../../system_wrappers/interface
-
-LOCAL_SHARED_LIBRARIES := \
- libcutils \
- libdl \
- libstlport
-
-ifndef NDK_ROOT
-include external/stlport/libstlport.mk
-endif
-include $(BUILD_STATIC_LIBRARY)
diff --git a/modules/video_coding/utility/Android.mk b/modules/video_coding/utility/Android.mk
deleted file mode 100644
index 4af007c6..00000000
--- a/modules/video_coding/utility/Android.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright (c) 2013 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_CLASS := STATIC_LIBRARIES
-LOCAL_MODULE := libvideo_coding_utility
-LOCAL_MODULE_TAGS := optional
-LOCAL_CPP_EXTENSION := .cc
-LOCAL_SRC_FILES := \
- exp_filter.cc \
- frame_dropper.cc \
-
-# Flags passed to both C and C++ files.
-LOCAL_CFLAGS := \
- $(MY_WEBRTC_COMMON_DEFS)
-
-LOCAL_C_INCLUDES := \
- $(LOCAL_PATH)/../../../../system_wrappers/interface
-
-LOCAL_SHARED_LIBRARIES := \
- libcutils \
- libdl \
- libstlport
-
-ifndef NDK_ROOT
-include external/stlport/libstlport.mk
-endif
-include $(BUILD_STATIC_LIBRARY)
diff --git a/modules/video_processing/main/source/Android.mk b/modules/video_processing/main/source/Android.mk
deleted file mode 100644
index 62eb3874..00000000
--- a/modules/video_processing/main/source/Android.mk
+++ /dev/null
@@ -1,58 +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_CLASS := STATIC_LIBRARIES
-LOCAL_MODULE := libwebrtc_video_processing
-LOCAL_MODULE_TAGS := optional
-LOCAL_CPP_EXTENSION := .cc
-LOCAL_SRC_FILES := \
- brighten.cc \
- brightness_detection.cc \
- color_enhancement.cc \
- content_analysis.cc \
- deflickering.cc \
- frame_preprocessor.cc \
- spatial_resampler.cc \
- video_decimator.cc \
- video_processing_impl.cc
-
-ifeq ($(TARGET_ARCH),x86)
-LOCAL_SRC_FILES += \
- content_analysis_sse2.cc
-endif
-
-# Flags passed to both C and C++ files.
-LOCAL_CFLAGS := \
- $(MY_WEBRTC_COMMON_DEFS)
-
-LOCAL_C_INCLUDES := \
- $(LOCAL_PATH)/../interface \
- $(LOCAL_PATH)/../../../.. \
- $(LOCAL_PATH)/../../../interface \
- $(LOCAL_PATH)/../../../audio_coding/main/interface \
- $(LOCAL_PATH)/../../../utility/interface \
- $(LOCAL_PATH)/../../../../common_audio/signal_processing/include \
- $(LOCAL_PATH)/../../../../common_video/vplib/main/interface \
- $(LOCAL_PATH)/../../../../system_wrappers/interface
-
-LOCAL_SHARED_LIBRARIES := \
- libcutils \
- libdl \
- libstlport
-
-ifndef NDK_ROOT
-include external/stlport/libstlport.mk
-endif
-include $(BUILD_STATIC_LIBRARY)
diff --git a/modules/video_render/Android.mk b/modules/video_render/Android.mk
deleted file mode 100644
index c11a89c0..00000000
--- a/modules/video_render/Android.mk
+++ /dev/null
@@ -1,53 +0,0 @@
-# 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
-# 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_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_MODULE := libwebrtc_video_render
-LOCAL_MODULE_TAGS := optional
-LOCAL_CPP_EXTENSION := .cc
-LOCAL_SRC_FILES := \
- incoming_video_stream.cc \
- video_render_frames.cc \
- video_render_impl.cc \
- external/video_render_external_impl.cc \
- android/video_render_android_impl.cc \
- android/video_render_android_native_opengl2.cc \
- android/video_render_android_surface_view.cc \
- android/video_render_opengles20.cc
-
-# Flags passed to both C and C++ files.
-LOCAL_CFLAGS := \
- $(MY_WEBRTC_COMMON_DEFS) \
- '-DWEBRTC_INCLUDE_INTERNAL_VIDEO_RENDER'
-
-LOCAL_C_INCLUDES := \
- $(LOCAL_PATH) \
- $(LOCAL_PATH)/android \
- $(LOCAL_PATH)/../interface \
- $(LOCAL_PATH)/../../../.. \
- $(LOCAL_PATH)/../../../audio_coding/main/interface \
- $(LOCAL_PATH)/../../../interface \
- $(LOCAL_PATH)/../../../utility/interface \
- $(LOCAL_PATH)/../../../../common_video/vplib/main/interface \
- $(LOCAL_PATH)/../../../../system_wrappers/interface
-
-LOCAL_SHARED_LIBRARIES := \
- libcutils \
- libdl \
- libstlport
-
-ifndef NDK_ROOT
-include external/stlport/libstlport.mk
-endif
-include $(BUILD_STATIC_LIBRARY)
diff --git a/system_wrappers/source/Android.mk b/system_wrappers/source/Android.mk
deleted file mode 100644
index 4767e72c..00000000
--- a/system_wrappers/source/Android.mk
+++ /dev/null
@@ -1,65 +0,0 @@
-# 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
-# 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_system_wrappers
-LOCAL_MODULE_TAGS := optional
-LOCAL_CPP_EXTENSION := .cc
-LOCAL_SRC_FILES := \
- cpu_features_android.c \
- sort.cc \
- aligned_malloc.cc \
- atomic32_posix.cc \
- condition_variable.cc \
- cpu_features.cc \
- cpu_info.cc \
- critical_section.cc \
- event.cc \
- event_tracer.cc \
- file_impl.cc \
- list_no_stl.cc \
- rw_lock.cc \
- thread.cc \
- trace_impl.cc \
- condition_variable_posix.cc \
- critical_section_posix.cc \
- event_posix.cc \
- rtp_to_ntp.cc \
- sleep.cc \
- thread_posix.cc \
- tick_util.cc \
- timestamp_extrapolator.cc \
- trace_posix.cc \
- rw_lock_posix.cc
-
-LOCAL_CFLAGS := \
- $(MY_WEBRTC_COMMON_DEFS)
-
-LOCAL_C_INCLUDES := \
- $(LOCAL_PATH)/../.. \
- $(LOCAL_PATH)/../interface \
- $(LOCAL_PATH)/spreadsortlib \
- external/webrtc
-
-LOCAL_SHARED_LIBRARIES := \
- libcutils \
- libdl \
- libstlport
-
-LOCAL_STATIC_LIBRARIES := cpufeatures
-
-ifndef NDK_ROOT
-include external/stlport/libstlport.mk
-endif
-include $(BUILD_STATIC_LIBRARY)
diff --git a/test/Android.mk b/test/Android.mk
deleted file mode 100644
index 73dceea3..00000000
--- a/test/Android.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-
-# 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
-# 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_test_support
-LOCAL_MODULE_TAGS := optional
-LOCAL_CPP_EXTENSION := .cc
-LOCAL_SRC_FILES:= \
- testsupport/android/root_path_android.cc \
- testsupport/fileutils.cc \
- testsupport/perf_test.cc
-
-# Flags passed to both C and C++ files.
-LOCAL_CFLAGS := \
- $(MY_WEBRTC_COMMON_DEFS)
-
-LOCAL_C_INCLUDES := \
- external/gtest/include \
- external/webrtc \
- external/webrtc/webrtc
-
-LOCAL_STATIC_LIBRARIES := \
- libgtest
-
-ifndef NDK_ROOT
-include external/stlport/libstlport.mk
-endif
-include $(BUILD_STATIC_LIBRARY)
diff --git a/video_engine/Android.mk b/video_engine/Android.mk
deleted file mode 100644
index 74866cc2..00000000
--- a/video_engine/Android.mk
+++ /dev/null
@@ -1,93 +0,0 @@
-# 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
-# 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_vie_core
-LOCAL_MODULE_TAGS := optional
-LOCAL_CPP_EXTENSION := .cc
-LOCAL_SRC_FILES := \
- vie_base_impl.cc \
- vie_capture_impl.cc \
- vie_codec_impl.cc \
- vie_external_codec_impl.cc \
- vie_file_impl.cc \
- vie_image_process_impl.cc \
- vie_impl.cc \
- vie_network_impl.cc \
- vie_ref_count.cc \
- vie_render_impl.cc \
- vie_rtp_rtcp_impl.cc \
- vie_shared_data.cc \
- vie_capturer.cc \
- vie_channel.cc \
- vie_channel_group.cc \
- vie_channel_manager.cc \
- vie_encoder.cc \
- vie_file_image.cc \
- vie_file_player.cc \
- vie_file_recorder.cc \
- vie_frame_provider_base.cc \
- vie_input_manager.cc \
- vie_manager_base.cc \
- vie_performance_monitor.cc \
- vie_receiver.cc \
- vie_remb.cc \
- vie_renderer.cc \
- vie_render_manager.cc \
- vie_sender.cc \
- vie_sync_module.cc
-
-# Flags passed to both C and C++ files.
-LOCAL_CFLAGS := \
- $(MY_WEBRTC_COMMON_DEFS)
-
-LOCAL_C_INCLUDES := \
- $(LOCAL_PATH)/include\
- $(LOCAL_PATH)/.. \
- $(LOCAL_PATH)/../common_video/interface \
- $(LOCAL_PATH)/../common_video/jpeg/main/interface \
- $(LOCAL_PATH)/../common_video/vplib/main/interface \
- $(LOCAL_PATH)/../modules/interface \
- $(LOCAL_PATH)/../modules/audio_coding/main/interface \
- $(LOCAL_PATH)/../modules/rtp_rtcp/interface \
- $(LOCAL_PATH)/../modules/udp_transport/interface \
- $(LOCAL_PATH)/../modules/utility/interface \
- $(LOCAL_PATH)/../modules/video_capture/main/interface \
- $(LOCAL_PATH)/../modules/video_capture/main/source \
- $(LOCAL_PATH)/../modules/video_capture/main/source/Android \
- $(LOCAL_PATH)/../modules/video_coding/codecs/interface \
- $(LOCAL_PATH)/../modules/video_coding/main/interface \
- $(LOCAL_PATH)/../modules/video_mixer/main/interface \
- $(LOCAL_PATH)/../modules/video_processing/main/interface \
- $(LOCAL_PATH)/../modules/video_render/main/interface \
- $(LOCAL_PATH)/../system_wrappers/interface \
- $(LOCAL_PATH)/../voice_engine/include
-
-LOCAL_SHARED_LIBRARIES := \
- libcutils \
- libdl \
- libstlport
-
-ifeq ($(TARGET_OS)-$(TARGET_SIMULATOR),linux-true)
-LOCAL_LDLIBS += -ldl -lpthread
-endif
-
-ifneq ($(TARGET_SIMULATOR),true)
-LOCAL_SHARED_LIBRARIES += libdl
-endif
-
-ifndef NDK_ROOT
-include external/stlport/libstlport.mk
-endif
-include $(BUILD_STATIC_LIBRARY)
diff --git a/video_engine/test/auto_test/android/Android.mk b/video_engine/test/auto_test/android/Android.mk
deleted file mode 100644
index 5f8d5482..00000000
--- a/video_engine/test/auto_test/android/Android.mk
+++ /dev/null
@@ -1,38 +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)
-
-MY_CAPTURE_FOLDER := ../../../../modules/video_capture/main/source
-MY_CAPTURE_JAVA_FOLDER := Android/java/org/webrtc/videoengine
-MY_CAPTURE_PATH := $(MY_CAPTURE_FOLDER)/$(MY_CAPTURE_JAVA_FOLDER)
-
-MY_RENDER_FOLDER := ../../../../modules/video_render/main/source
-MY_RENDER_JAVA_FOLDER := Android/java/org/webrtc/videoengine
-MY_RENDER_PATH := $(MY_RENDER_FOLDER)/$(MY_RENDER_JAVA_FOLDER)
-
-LOCAL_MODULE_TAGS := tests
-
-LOCAL_SRC_FILES := \
- src/org/webrtc/vieautotest/ViEAutotest.java \
- $(MY_CAPTURE_PATH)/VideoCaptureAndroid.java \
- $(MY_CAPTURE_PATH)/VideoCaptureDeviceInfoAndroid.java \
- $(MY_RENDER_PATH)/ViEAndroidGLES20.java \
- $(MY_RENDER_PATH)/ViERenderer.java \
- $(MY_RENDER_PATH)/ViESurfaceRenderer.java
-
-LOCAL_PACKAGE_NAME := webrtc-video-autotest
-LOCAL_CERTIFICATE := platform
-
-LOCAL_JNI_SHARED_LIBRARIES := libwebrtc-video-autotest-jni
-
-include $(BUILD_PACKAGE)
-
-include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/video_engine/test/auto_test/android/jni/Android.mk b/video_engine/test/auto_test/android/jni/Android.mk
deleted file mode 100644
index 284ecabb..00000000
--- a/video_engine/test/auto_test/android/jni/Android.mk
+++ /dev/null
@@ -1,76 +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)
-
-# the follow two lines are for NDK build
-INTERFACES_PATH := $(LOCAL_PATH)/../../../../../../build/interface
-LIBS_PATH := $(LOCAL_PATH)/../../../../../../build/libraries
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := tests
-LOCAL_MODULE := libwebrtc-video-autotest-jni
-LOCAL_CPP_EXTENSION := .cc
-LOCAL_SRC_FILES := \
- vie_autotest_jni.cc \
- ../../source/vie_autotest_android.cc \
- ../../source/vie_autotest.cc \
- ../../source/vie_autotest_base.cc \
- ../../source/vie_autotest_capture.cc \
- ../../source/vie_autotest_codec.cc \
- ../../source/vie_autotest_file.cc \
- ../../source/vie_autotest_image_process.cc \
- ../../source/vie_autotest_loopback.cc \
- ../../source/vie_autotest_network.cc \
- ../../source/vie_autotest_render.cc \
- ../../source/vie_autotest_rtp_rtcp.cc \
- ../../source/tb_I420_codec.cc \
- ../../source/tb_capture_device.cc \
- ../../source/tb_external_transport.cc \
- ../../source/tb_interfaces.cc \
- ../../source/tb_video_channel.cc
-
-LOCAL_CFLAGS := \
- '-DWEBRTC_TARGET_PC' \
- '-DWEBRTC_ANDROID' \
- '-DWEBRTC_ANDROID_OPENSLES'
-
-LOCAL_C_INCLUDES := \
- external/gtest/include \
- $(LOCAL_PATH)/../interface \
- $(LOCAL_PATH)/../../interface \
- $(LOCAL_PATH)/../../../interface \
- $(LOCAL_PATH)/../../.. \
- $(LOCAL_PATH)/../../../../.. \
- $(LOCAL_PATH)/../../../../../common_video/interface \
- $(LOCAL_PATH)/../../../../../common_video/vplib/main/interface \
- $(LOCAL_PATH)/../../../../../modules/interface \
- $(LOCAL_PATH)/../../../../../modules/video_capture/main/interface \
- $(LOCAL_PATH)/../../../../../modules/video_capture/main/source \
- $(LOCAL_PATH)/../../../../../modules/video_coding/codecs/interface \
- $(LOCAL_PATH)/../../../../../modules/video_render/main/interface \
- $(LOCAL_PATH)/../../../../../voice_engine/include \
- $(LOCAL_PATH)/../../../../../system_wrappers/interface
-
-LOCAL_PRELINK_MODULE := false
-
-LOCAL_SHARED_LIBRARIES := \
- libutils \
- libstlport \
- libandroid \
- libwebrtc \
- libGLESv2
-
-# the following line is for NDK build
-LOCAL_LDLIBS := $(LIBS_PATH)/VideoEngine_android_gcc.a -llog -lgcc
-
-ifndef NDK_ROOT
-include external/stlport/libstlport.mk
-endif
-include $(BUILD_SHARED_LIBRARY)
diff --git a/video_engine/test/auto_test/source/Android.mk b/video_engine/test/auto_test/source/Android.mk
deleted file mode 100644
index ffe113b9..00000000
--- a/video_engine/test/auto_test/source/Android.mk
+++ /dev/null
@@ -1,64 +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)
-
-# voice engine test app
-
-include $(CLEAR_VARS)
-
-include $(LOCAL_PATH)/../../../../../android-webrtc.mk
-
-LOCAL_MODULE_TAGS := tests
-LOCAL_CPP_EXTENSION := .cc
-LOCAL_SRC_FILES:= \
- vie_autotest.cc \
- vie_autotest_android.cc \
- vie_autotest_base.cc \
- vie_autotest_capture.cc \
- vie_autotest_codec.cc \
- vie_autotest_file.cc \
- vie_autotest_image_process.cc \
- vie_autotest_loopback.cc \
- vie_autotest_network.cc \
- vie_autotest_render.cc \
- vie_autotest_rtp_rtcp.cc \
- vie_comparison_tests.cc
-
-# Flags passed to both C and C++ files.
-LOCAL_CFLAGS := \
- '-DWEBRTC_TARGET_PC' \
- '-DWEBRTC_ANDROID' \
- '-DWEBRTC_ANDROID_OPENSLES'
-
-LOCAL_C_INCLUDES := \
- $(LOCAL_PATH)/../interface \
- $(LOCAL_PATH)/../helpers \
- $(LOCAL_PATH)/../primitives \
- $(LOCAL_PATH)/../../../.. \
- $(LOCAL_PATH)/../../../include \
- $(LOCAL_PATH)/../../.. \
- $(LOCAL_PATH)/../../../../modules/video_coding/codecs/interface \
- $(LOCAL_PATH)/../../../../system_wrappers/interface \
- $(LOCAL_PATH)/../../../../modules/video_render/main/interface \
- $(LOCAL_PATH)/../../../../modules/interface \
- $(LOCAL_PATH)/../../../../modules/video_capture/main/interface \
- $(LOCAL_PATH)/../../../../common_video/vplib/main/interface \
- $(LOCAL_PATH)/../../../../voice_engine/include
-
-LOCAL_SHARED_LIBRARIES := \
- libutils \
- libstlport \
- libwebrtc
-
-LOCAL_MODULE:= webrtc_video_test
-
-ifndef NDK_ROOT
-include external/stlport/libstlport.mk
-endif
-include $(BUILD_EXECUTABLE)
diff --git a/voice_engine/Android.mk b/voice_engine/Android.mk
deleted file mode 100644
index 3dc3c36b..00000000
--- a/voice_engine/Android.mk
+++ /dev/null
@@ -1,86 +0,0 @@
-# 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
-# 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_voe_core
-LOCAL_MODULE_TAGS := optional
-LOCAL_CPP_EXTENSION := .cc
-LOCAL_SRC_FILES := \
- audio_frame_operations.cc \
- channel.cc \
- channel_manager.cc \
- dtmf_inband.cc \
- dtmf_inband_queue.cc \
- level_indicator.cc \
- monitor_module.cc \
- output_mixer.cc \
- ref_count.cc \
- shared_data.cc \
- statistics.cc \
- transmit_mixer.cc \
- utility.cc \
- voe_audio_processing_impl.cc \
- voe_base_impl.cc \
- voe_call_report_impl.cc \
- voe_codec_impl.cc \
- voe_dtmf_impl.cc \
- voe_external_media_impl.cc \
- voe_file_impl.cc \
- voe_hardware_impl.cc \
- voe_neteq_stats_impl.cc \
- voe_network_impl.cc \
- voe_rtp_rtcp_impl.cc \
- voe_video_sync_impl.cc \
- voe_volume_control_impl.cc \
- voice_engine_impl.cc
-
-# Flags passed to both C and C++ files.
-LOCAL_CFLAGS := \
- $(MY_WEBRTC_COMMON_DEFS) \
- '-DWEBRTC_ANDROID_OPENSLES'
-
-LOCAL_C_INCLUDES := \
- $(LOCAL_PATH)/../interface \
- $(LOCAL_PATH)/../../.. \
- $(LOCAL_PATH)/../../../common_audio/resampler/include \
- $(LOCAL_PATH)/../../../common_audio/signal_processing/include \
- $(LOCAL_PATH)/../../../modules/interface \
- $(LOCAL_PATH)/../../../modules/audio_coding/main/interface \
- $(LOCAL_PATH)/../../../modules/audio_conference_mixer/interface \
- $(LOCAL_PATH)/../../../modules/audio_device/main/interface \
- $(LOCAL_PATH)/../../../modules/audio_device/main/source \
- $(LOCAL_PATH)/../../../modules/audio_processing/include \
- $(LOCAL_PATH)/../../../modules/media_file/interface \
- $(LOCAL_PATH)/../../../modules/rtp_rtcp/interface \
- $(LOCAL_PATH)/../../../modules/udp_transport/interface \
- $(LOCAL_PATH)/../../../modules/utility/interface \
- $(LOCAL_PATH)/../../../system_wrappers/interface
-
-LOCAL_SHARED_LIBRARIES := \
- libcutils \
- libdl \
- libstlport
-
-ifeq ($(TARGET_OS)-$(TARGET_SIMULATOR),linux-true)
-LOCAL_LDLIBS += -ldl -lpthread
-endif
-
-ifneq ($(TARGET_SIMULATOR),true)
-LOCAL_SHARED_LIBRARIES += libdl
-endif
-
-ifndef NDK_ROOT
-include external/stlport/libstlport.mk
-endif
-include $(BUILD_STATIC_LIBRARY)
diff --git a/voice_engine/test/android/android_test/Android.mk b/voice_engine/test/android/android_test/Android.mk
deleted file mode 100644
index a3f5ce60..00000000
--- a/voice_engine/test/android/android_test/Android.mk
+++ /dev/null
@@ -1,25 +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)
-
-LOCAL_MODULE_TAGS := tests
-
-LOCAL_SRC_FILES := \
- src/org/webrtc/voiceengine/test/AndroidTest.java
-
-LOCAL_PACKAGE_NAME := webrtc-voice-demo
-LOCAL_CERTIFICATE := platform
-
-LOCAL_JNI_SHARED_LIBRARIES := libwebrtc-voice-demo-jni
-
-include $(BUILD_PACKAGE)
-
-include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/voice_engine/test/android/android_test/jni/Android.mk b/voice_engine/test/android/android_test/jni/Android.mk
deleted file mode 100644
index d7e04b56..00000000
--- a/voice_engine/test/android/android_test/jni/Android.mk
+++ /dev/null
@@ -1,152 +0,0 @@
-# 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
-# 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.
-
-ifdef NDK_ROOT
-
-MY_WEBRTC_ROOT_PATH := $(call my-dir)
-
-MY_WEBRTC_SRC_PATH := ../../../../../../..
-
-include $(MY_WEBRTC_ROOT_PATH)/$(MY_WEBRTC_SRC_PATH)/src/common_audio/resampler/Android.mk
-include $(MY_WEBRTC_ROOT_PATH)/$(MY_WEBRTC_SRC_PATH)/src/common_audio/signal_processing/Android.mk
-include $(MY_WEBRTC_ROOT_PATH)/$(MY_WEBRTC_SRC_PATH)/src/common_audio/vad/Android.mk
-include $(MY_WEBRTC_ROOT_PATH)/$(MY_WEBRTC_SRC_PATH)/src/modules/audio_coding/neteq/Android.mk
-include $(MY_WEBRTC_ROOT_PATH)/$(MY_WEBRTC_SRC_PATH)/src/modules/audio_coding/codecs/cng/Android.mk
-include $(MY_WEBRTC_ROOT_PATH)/$(MY_WEBRTC_SRC_PATH)/src/modules/audio_coding/codecs/g711/Android.mk
-include $(MY_WEBRTC_ROOT_PATH)/$(MY_WEBRTC_SRC_PATH)/src/modules/audio_coding/codecs/g722/Android.mk
-include $(MY_WEBRTC_ROOT_PATH)/$(MY_WEBRTC_SRC_PATH)/src/modules/audio_coding/codecs/pcm16b/Android.mk
-include $(MY_WEBRTC_ROOT_PATH)/$(MY_WEBRTC_SRC_PATH)/src/modules/audio_coding/codecs/ilbc/Android.mk
-include $(MY_WEBRTC_ROOT_PATH)/$(MY_WEBRTC_SRC_PATH)/src/modules/audio_coding/codecs/iSAC/fix/source/Android.mk
-include $(MY_WEBRTC_ROOT_PATH)/$(MY_WEBRTC_SRC_PATH)/src/modules/audio_coding/codecs/iSAC/main/source/Android.mk
-include $(MY_WEBRTC_ROOT_PATH)/$(MY_WEBRTC_SRC_PATH)/src/modules/audio_coding/main/source/Android.mk
-include $(MY_WEBRTC_ROOT_PATH)/$(MY_WEBRTC_SRC_PATH)/src/modules/audio_conference_mixer/source/Android.mk
-include $(MY_WEBRTC_ROOT_PATH)/$(MY_WEBRTC_SRC_PATH)/src/modules/audio_device/main/source/Android.mk
-include $(MY_WEBRTC_ROOT_PATH)/$(MY_WEBRTC_SRC_PATH)/src/modules/audio_processing/aec/Android.mk
-include $(MY_WEBRTC_ROOT_PATH)/$(MY_WEBRTC_SRC_PATH)/src/modules/audio_processing/aecm/Android.mk
-include $(MY_WEBRTC_ROOT_PATH)/$(MY_WEBRTC_SRC_PATH)/src/modules/audio_processing/agc/Android.mk
-include $(MY_WEBRTC_ROOT_PATH)/$(MY_WEBRTC_SRC_PATH)/src/modules/audio_processing/Android.mk
-include $(MY_WEBRTC_ROOT_PATH)/$(MY_WEBRTC_SRC_PATH)/src/modules/audio_processing/ns/Android.mk
-include $(MY_WEBRTC_ROOT_PATH)/$(MY_WEBRTC_SRC_PATH)/src/modules/audio_processing/utility/Android.mk
-include $(MY_WEBRTC_ROOT_PATH)/$(MY_WEBRTC_SRC_PATH)/src/modules/media_file/source/Android.mk
-include $(MY_WEBRTC_ROOT_PATH)/$(MY_WEBRTC_SRC_PATH)/src/modules/rtp_rtcp/source/Android.mk
-include $(MY_WEBRTC_ROOT_PATH)/$(MY_WEBRTC_SRC_PATH)/src/modules/udp_transport/source/Android.mk
-include $(MY_WEBRTC_ROOT_PATH)/$(MY_WEBRTC_SRC_PATH)/src/modules/utility/source/Android.mk
-include $(MY_WEBRTC_ROOT_PATH)/$(MY_WEBRTC_SRC_PATH)/src/system_wrappers/source/Android.mk
-include $(MY_WEBRTC_ROOT_PATH)/$(MY_WEBRTC_SRC_PATH)/src/voice_engine/Android.mk
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_ARM_MODE := arm
-LOCAL_MODULE := libwebrtc_audio_preprocessing
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_WHOLE_STATIC_LIBRARIES := \
- libwebrtc_spl \
- libwebrtc_resampler \
- libwebrtc_apm \
- libwebrtc_apm_utility \
- libwebrtc_vad \
- libwebrtc_ns \
- libwebrtc_agc \
- libwebrtc_aec \
- libwebrtc_aecm \
- libwebrtc_system_wrappers \
-
-LOCAL_SHARED_LIBRARIES := \
- libcutils \
- libstlport_shared
-
-LOCAL_LDLIBS := \
- -lgcc \
- -llog
-
-LOCAL_PRELINK_MODULE := false
-
-include $(BUILD_SHARED_LIBRARY)
-
-###
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_ARM_MODE := arm
-LOCAL_MODULE := libwebrtc-voice-jni
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_WHOLE_STATIC_LIBRARIES := \
- libwebrtc_system_wrappers \
- libwebrtc_audio_device \
- libwebrtc_pcm16b \
- libwebrtc_cng \
- libwebrtc_audio_coding \
- libwebrtc_rtp_rtcp \
- libwebrtc_media_file \
- libwebrtc_udp_transport \
- libwebrtc_utility \
- libwebrtc_neteq \
- libwebrtc_audio_conference_mixer \
- libwebrtc_isac \
- libwebrtc_ilbc \
- libwebrtc_isacfix \
- libwebrtc_g722 \
- libwebrtc_g711 \
- libwebrtc_voe_core
-
-LOCAL_SHARED_LIBRARIES := \
- libcutils \
- libstlport_shared \
- libwebrtc_audio_preprocessing
-
-LOCAL_LDLIBS := \
- -lgcc \
- -llog \
- -lOpenSLES
-
-LOCAL_PRELINK_MODULE := false
-
-include $(BUILD_SHARED_LIBRARY)
-
-###
-
-include $(MY_WEBRTC_ROOT_PATH)/$(MY_WEBRTC_SRC_PATH)/src/voice_engine/test/cmd_test/Android.mk
-
-else
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := tests
-LOCAL_MODULE := libwebrtc-voice-demo-jni
-LOCAL_CPP_EXTENSION := .cc
-LOCAL_SRC_FILES := android_test.cc
-LOCAL_CFLAGS := \
- '-DWEBRTC_TARGET_PC' \
- '-DWEBRTC_ANDROID'
-
-LOCAL_C_INCLUDES := \
- $(LOCAL_PATH)/../../../auto_test \
- $(LOCAL_PATH)/../../../../interface \
- $(LOCAL_PATH)/../../../../../.. \
- $(LOCAL_PATH)/../../../../../../system_wrappers/interface
-
-LOCAL_PRELINK_MODULE := false
-
-LOCAL_SHARED_LIBRARIES := \
- libutils \
- libstlport \
- libandroid \
- libwebrtc \
- libGLESv2
-
-include $(BUILD_SHARED_LIBRARY)
-
-endif
diff --git a/voice_engine/test/auto_test/Android.mk b/voice_engine/test/auto_test/Android.mk
deleted file mode 100644
index cfb9d670..00000000
--- a/voice_engine/test/auto_test/Android.mk
+++ /dev/null
@@ -1,56 +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)
-
-# voice engine test app
-
-include $(CLEAR_VARS)
-
-include $(LOCAL_PATH)/../../../../../android-webrtc.mk
-
-LOCAL_MODULE_TAGS := tests
-LOCAL_CPP_EXTENSION := .cc
-LOCAL_SRC_FILES:= \
- automated_mode.cc \
- voe_cpu_test.cc \
- voe_standard_test.cc \
- voe_stress_test.cc \
- voe_unit_test.cc \
- voe_extended_test.cc \
- voe_standard_integration_test.cc
-
-# Flags passed to both C and C++ files.
-LOCAL_CFLAGS := \
- '-DWEBRTC_TARGET_PC' \
- '-DWEBRTC_LINUX' \
- '-DWEBRTC_ANDROID'
-
-LOCAL_C_INCLUDES := \
- $(LOCAL_PATH)/../../interface \
- $(LOCAL_PATH)/../../../.. \
- $(LOCAL_PATH)/../../../../modules/audio_device/main/interface \
- $(LOCAL_PATH)/../../../../modules/interface \
- $(LOCAL_PATH)/../../../../system_wrappers/interface \
- $(LOCAL_PATH)/../../../../../test \
- external/gtest/include \
-
-LOCAL_SHARED_LIBRARIES := \
- libutils \
- libstlport \
- libwebrtc
-
-LOCAL_MODULE:= webrtc_voe_autotest
-
-ifdef NDK_ROOT
-include $(BUILD_EXECUTABLE)
-else
-include external/stlport/libstlport.mk
-include $(BUILD_NATIVE_TEST)
-endif
-
diff --git a/voice_engine/test/cmd_test/Android.mk b/voice_engine/test/cmd_test/Android.mk
deleted file mode 100644
index f1a4f1af..00000000
--- a/voice_engine/test/cmd_test/Android.mk
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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
-# 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)
-
-# voice engine test app
-
-include $(CLEAR_VARS)
-
-include $(LOCAL_PATH)/../../../../../android-webrtc.mk
-
-LOCAL_MODULE_TAGS := tests
-LOCAL_CPP_EXTENSION := .cc
-LOCAL_SRC_FILES:= \
- voe_cmd_test.cc
-
-# Flags passed to both C and C++ files.
-LOCAL_CFLAGS := \
- '-DWEBRTC_TARGET_PC' \
- '-DWEBRTC_ANDROID' \
- '-DDEBUG'
-
-LOCAL_C_INCLUDES := \
- $(LOCAL_PATH)/../../interface \
- $(LOCAL_PATH)/../../../.. \
- $(LOCAL_PATH)/../../../../.. \
- external/gtest/include \
- frameworks/base/include
-
-LOCAL_SHARED_LIBRARIES := \
- libutils \
- libmedia \
- libcamera_client \
- libgui \
- libhardware \
- libandroid_runtime \
- libbinder
-
-#libwilhelm.so libDunDef-Android.so libbinder.so libsystem_server.so
-
-LOCAL_MODULE:= webrtc_voe_cmd
-
-ifdef NDK_ROOT
-LOCAL_SHARED_LIBRARIES += \
- libstlport_shared \
- libwebrtc-voice-jni \
- libwebrtc_audio_preprocessing
-include $(BUILD_EXECUTABLE)
-else
-LOCAL_SHARED_LIBRARIES += \
- libstlport \
- libwebrtc
-include external/stlport/libstlport.mk
-include $(BUILD_NATIVE_TEST)
-endif