diff options
author | Dan Willemsen <dwillemsen@google.com> | 2017-10-26 07:03:01 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-10-26 07:03:01 +0000 |
commit | ff3826d38268ab90b557f4992c25fdfa73ee1d23 (patch) | |
tree | d7e9c17332b4c741cd3115663626f3fd2e9c9cfb | |
parent | d0febdf0968a600b76be5f1c7301f1cb906b0081 (diff) | |
parent | e1ce5311ac69a311e79376affe43046aa0dc787b (diff) | |
download | webrtc-ff3826d38268ab90b557f4992c25fdfa73ee1d23.tar.gz |
Merge changes from topic "instruction_set_replace"
am: e1ce5311ac
Change-Id: If7dcd81893e272465694656e955c1081bdc12457
46 files changed, 929 insertions, 1338 deletions
diff --git a/Android.bp b/Android.bp new file mode 100644 index 0000000000..39ea862d90 --- /dev/null +++ b/Android.bp @@ -0,0 +1,152 @@ +// 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. + +// These defines will apply to all source files +// Think again before changing it +cc_defaults { + name: "webrtc_flags", + vendor: true, + + cflags: [ + "-DWEBRTC_POSIX", + "-DWEBRTC_LINUX", + "-DWEBRTC_THREAD_RR", + "-DWEBRTC_CLOCK_TYPE_REALTIME", + "-DWEBRTC_ANDROID", + + // The following macros are used by modules, + // we might need to re-organize them + // "-DWEBRTC_ANDROID_OPENSLES", // [module audio_device] + // "-DNETEQ_VOICEENGINE_CODECS", // [module audio_coding neteq] + // "-DWEBRTC_MODULE_UTILITY_VIDEO", // [module media_file] [module utility] + + // The following warnings are disabled in most webrtc modules, + // until we upgrade to newer cleaner upstream webrtc. + "-Wno-missing-field-initializers", + "-Wno-unused-parameter", + ], + + header_libs: ["libwebrtc_headers"], + + arch: { + arm: { + instruction_set: "arm", + + cflags: [ + "-DWEBRTC_ARCH_ARM", + // "-DWEBRTC_DETECT_ARM_NEON", // only used in a build configuration without Neon + // TODO(kma): figure out if the above define could be moved to NDK build only. + + // The following upstram ARM_NEON and ARMV7A defintions do not work on AOSP yet. + // They should be fixed in the next merge from upstream. + //# TODO(kma): test if the code under next two macros works with generic GCC compilers + // "-DWEBRTC_ARCH_ARM_NEON", + // "-flax-vector-conversions", + // "-DWEBRTC_ARCH_ARM_V7A", + ], + }, + }, + + // The following clang-tidy checks are disabled in most webrtc modules, + // until we upgrade to newer cleaner upstream webrtc. + tidy_checks: [ + "-cert-*", + "-clang-analyzer-*", + "-hicpp-*", + "-llvm-*", + "-google-build-namespaces", + "-google-default-arguments", + "-google-explicit-constructor", + "-google-runtime-int", + "-google-runtime-operator", + "-misc-incorrect-roundings", + "-misc-macro-parentheses", + "-misc-misplaced-widening-cast", + "-misc-noexcept-move-constructor", + "-misc-suspicious-string-compare", + "-misc-unused-parameters", + "-misc-unused-using-decls", + "-performance-type-promotion-in-math-fn", + "-performance-unnecessary-copy-initialization", + "-performance-unnecessary-value-param", + ], +} + +cc_library_shared { + name: "libwebrtc_audio_preprocessing", + vendor: true, + + whole_static_libs: [ + "libwebrtc_aec", + "libwebrtc_aecm", + "libwebrtc_agc", + "libwebrtc_apm", + "libwebrtc_apm_utility", + "libwebrtc_apvad", + "libwebrtc_base", + "libwebrtc_beamformer", + "libwebrtc_common", + "libwebrtc_intell", + "libwebrtc_isac", + "libwebrtc_resampler", + "libwebrtc_ns", + "libwebrtc_spl", + "libwebrtc_system_wrappers", + "libwebrtc_transient", + "libwebrtc_vad", + ], + + shared_libs: [ + "liblog", + "libcutils", + "libdl", + "libprotobuf-cpp-lite", + ], + + arch: { + arm: { + instruction_set: "arm", + }, + }, +} + +cc_library_shared { + name: "libwebrtc_audio_coding", + vendor: true, + + whole_static_libs: [ + "libwebrtc_base", + "libwebrtc_common", + "libwebrtc_intell", + "libwebrtc_isac", + "libwebrtc_isacfix", + "libwebrtc_resampler", + "libwebrtc_spl", + "libwebrtc_system_wrappers", + ], + + shared_libs: [ + "libprotobuf-cpp-lite", + "liblog", + "libcutils", + "libdl", + ], + + arch: { + arm: { + instruction_set: "arm", + }, + }, +} + +cc_library_headers { + name: "libwebrtc_headers", + export_include_dirs: ["."], +} + +subdirs = ["webrtc/*"] diff --git a/Android.mk b/Android.mk deleted file mode 100644 index 77fdadf344..0000000000 --- a/Android.mk +++ /dev/null @@ -1,94 +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_audio_preprocessing -LOCAL_VENDOR_MODULE := true -LOCAL_MODULE_TAGS := optional - -LOCAL_WHOLE_STATIC_LIBRARIES := \ - libwebrtc_aec \ - libwebrtc_aecm \ - libwebrtc_agc \ - libwebrtc_apm \ - libwebrtc_apm_utility \ - libwebrtc_apvad \ - libwebrtc_base \ - libwebrtc_beamformer \ - libwebrtc_common \ - libwebrtc_intell \ - libwebrtc_isac \ - libwebrtc_resampler \ - libwebrtc_ns \ - libwebrtc_spl \ - libwebrtc_system_wrappers \ - libwebrtc_transient \ - libwebrtc_vad \ - -LOCAL_SHARED_LIBRARIES := \ - liblog \ - libcutils \ - libdl \ - libprotobuf-cpp-lite \ - -include $(BUILD_SHARED_LIBRARY) - - -include $(CLEAR_VARS) -include $(LOCAL_PATH)/android-webrtc.mk - -LOCAL_ARM_MODE := arm -LOCAL_MODULE := libwebrtc_audio_coding -LOCAL_VENDOR_MODULE := true -LOCAL_MODULE_TAGS := optional - -LOCAL_WHOLE_STATIC_LIBRARIES := \ - libwebrtc_base \ - libwebrtc_common \ - libwebrtc_intell \ - libwebrtc_isac \ - libwebrtc_isacfix \ - libwebrtc_resampler \ - libwebrtc_spl \ - libwebrtc_system_wrappers \ - -LOCAL_SHARED_LIBRARIES := \ - libprotobuf-cpp-lite \ - liblog \ - libcutils \ - libdl \ - -include $(BUILD_SHARED_LIBRARY) - - -webrtc_path := $(LOCAL_PATH) -# voice -include $(webrtc_path)/webrtc/base/Android.mk -include $(webrtc_path)/webrtc/common_audio/Android.mk -include $(webrtc_path)/webrtc/common_audio/resampler/Android.mk -include $(webrtc_path)/webrtc/common_audio/signal_processing/Android.mk -include $(webrtc_path)/webrtc/common_audio/vad/Android.mk -include $(webrtc_path)/webrtc/modules/audio_coding/codecs/isac/fix/test/Android.mk -include $(webrtc_path)/webrtc/modules/audio_coding/codecs/isac/fix/source/Android.mk -include $(webrtc_path)/webrtc/modules/audio_coding/codecs/isac/main/source/Android.mk -include $(webrtc_path)/webrtc/modules/audio_processing/Android.mk -include $(webrtc_path)/webrtc/modules/audio_processing/aec/Android.mk -include $(webrtc_path)/webrtc/modules/audio_processing/aecm/Android.mk -include $(webrtc_path)/webrtc/modules/audio_processing/agc/Android.mk -include $(webrtc_path)/webrtc/modules/audio_processing/beamformer/Android.mk -include $(webrtc_path)/webrtc/modules/audio_processing/intelligibility/Android.mk -include $(webrtc_path)/webrtc/modules/audio_processing/ns/Android.mk -include $(webrtc_path)/webrtc/modules/audio_processing/transient/Android.mk -include $(webrtc_path)/webrtc/modules/audio_processing/utility/Android.mk -include $(webrtc_path)/webrtc/modules/audio_processing/vad/Android.mk -include $(webrtc_path)/webrtc/system_wrappers/source/Android.mk diff --git a/android-webrtc.mk b/android-webrtc.mk deleted file mode 100644 index 888d4cbb16..0000000000 --- a/android-webrtc.mk +++ /dev/null @@ -1,70 +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. - -# These defines will apply to all source files -# Think again before changing it -MY_WEBRTC_COMMON_DEFS := \ - '-DWEBRTC_POSIX' \ - '-DWEBRTC_LINUX' \ - '-DWEBRTC_THREAD_RR' \ - '-DWEBRTC_CLOCK_TYPE_REALTIME' \ - '-DWEBRTC_ANDROID' -# The following macros are used by modules, -# we might need to re-organize them -# '-DWEBRTC_ANDROID_OPENSLES' [module audio_device] -# '-DNETEQ_VOICEENGINE_CODECS' [module audio_coding neteq] -# '-DWEBRTC_MODULE_UTILITY_VIDEO' [module media_file] [module utility] -MY_WEBRTC_COMMON_DEFS_arm := \ - '-DWEBRTC_ARCH_ARM' -# '-DWEBRTC_DETECT_ARM_NEON' # only used in a build configuration without Neon -# TODO(kma): figure out if the above define could be moved to NDK build only. - - -# The following upstram ARM_NEON and ARMV7A defintions do not work on AOSP yet. -# They should be fixed in the next merge from upstream. -## TODO(kma): test if the code under next two macros works with generic GCC compilers -#ifeq ($(ARCH_ARM_HAVE_NEON),true) -#MY_WEBRTC_COMMON_DEFS_arm += \ -# '-DWEBRTC_ARCH_ARM_NEON' -#MY_ARM_CFLAGS_NEON := \ -# -flax-vector-conversions -#endif -# -#ifeq ($(ARCH_ARM_HAVE_ARMV7A),true) -#MY_WEBRTC_COMMON_DEFS_arm += \ -# '-DWEBRTC_ARCH_ARM_V7A' -#endif - -# The following warnings are disabled in most webrtc modules, -# until we upgrade to newer cleaner upstream webrtc. -MY_WEBRTC_COMMON_CFLAGS_WARNINGS := \ - -Wno-missing-field-initializers \ - -Wno-unused-parameter \ - -# The following clang-tidy checks are disabled in most webrtc modules, -# until we upgrade to newer cleaner upstream webrtc. -MY_WEBRTC_COMMON_TIDY_CHECKS := \ - -cert-*, \ - -clang-analyzer-*, \ - -hicpp-*, \ - -llvm-*, \ - -google-build-namespaces, \ - -google-default-arguments, \ - -google-explicit-constructor, \ - -google-runtime-int, \ - -google-runtime-operator, \ - -misc-incorrect-roundings, \ - -misc-macro-parentheses, \ - -misc-misplaced-widening-cast, \ - -misc-noexcept-move-constructor, \ - -misc-suspicious-string-compare, \ - -misc-unused-parameters, \ - -misc-unused-using-decls, \ - -performance-type-promotion-in-math-fn, \ - -performance-unnecessary-copy-initialization, \ - -performance-unnecessary-value-param, \ diff --git a/webrtc/base/Android.bp b/webrtc/base/Android.bp new file mode 100644 index 0000000000..3d1270f685 --- /dev/null +++ b/webrtc/base/Android.bp @@ -0,0 +1,27 @@ +// Copyright (c) 2015 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. + +cc_library_static { + name: "libwebrtc_base", + defaults: ["webrtc_flags"], + + srcs: [ + "checks.cc", + "criticalsection.cc", + "event.cc", + "event_tracer.cc", + "logging.cc", + "platform_file.cc", + "platform_thread.cc", + "stringencode.cc", + "systeminfo.cc", + "timeutils.cc", + ], + + shared_libs: ["liblog"], +} diff --git a/webrtc/base/Android.mk b/webrtc/base/Android.mk deleted file mode 100644 index d1b9097b36..0000000000 --- a/webrtc/base/Android.mk +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright (c) 2015 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_base -LOCAL_VENDOR_MODULE := true -LOCAL_MODULE_TAGS := optional -LOCAL_CPP_EXTENSION := .cc -LOCAL_SRC_FILES := \ - checks.cc \ - criticalsection.cc \ - event.cc \ - event_tracer.cc \ - logging.cc \ - platform_file.cc \ - platform_thread.cc \ - stringencode.cc \ - systeminfo.cc \ - timeutils.cc \ - -# Flags passed to both C and C++ files. -LOCAL_CFLAGS := \ - $(MY_WEBRTC_COMMON_DEFS) - -LOCAL_CFLAGS_arm := $(MY_WEBRTC_COMMON_DEFS_arm) -LOCAL_CFLAGS_x86 := $(MY_WEBRTC_COMMON_DEFS_x86) -LOCAL_CFLAGS_mips := $(MY_WEBRTC_COMMON_DEFS_mips) -LOCAL_CFLAGS_arm64 := $(MY_WEBRTC_COMMON_DEFS_arm64) -LOCAL_CFLAGS_x86_64 := $(MY_WEBRTC_COMMON_DEFS_x86_64) -LOCAL_CFLAGS_mips64 := $(MY_WEBRTC_COMMON_DEFS_mips64) - -LOCAL_CFLAGS += $(MY_WEBRTC_COMMON_CFLAGS_WARNINGS) -LOCAL_TIDY_CHECKS := $(MY_WEBRTC_COMMON_TIDY_CHECKS) - -# Include paths placed before CFLAGS/CPPFLAGS -LOCAL_C_INCLUDES := \ - $(LOCAL_PATH) \ - $(LOCAL_PATH)/../.. \ - -LOCAL_SHARED_LIBRARIES += liblog - -include $(BUILD_STATIC_LIBRARY) diff --git a/webrtc/common_audio/Android.bp b/webrtc/common_audio/Android.bp new file mode 100644 index 0000000000..1ecf430c0c --- /dev/null +++ b/webrtc/common_audio/Android.bp @@ -0,0 +1,47 @@ +// Copyright (c) 2015 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. + +subdirs = ["*"] + +cc_library_static { + name: "libwebrtc_common", + defaults: ["webrtc_flags"], + + srcs: [ + "audio_converter.cc", + "audio_util.cc", + "blocker.cc", + "channel_buffer.cc", + "fft4g.c", + "fir_filter.cc", + "lapped_transform.cc", + "real_fourier_ooura.cc", + "real_fourier.cc", + "ring_buffer.c", + "audio_ring_buffer.cc", + "sparse_fir_filter.cc", + "window_generator.cc", + ], + + arch: { + x86: { + srcs: ["fir_filter_sse.cc"], + }, + x86_64: { + srcs: ["fir_filter_sse.cc"], + }, + }, +} + +filegroup { + name: "webrtc_common_audio_wav", + srcs: [ + "wav_file.cc", + "wav_header.cc", + ], +} diff --git a/webrtc/common_audio/Android.mk b/webrtc/common_audio/Android.mk deleted file mode 100644 index 6b4d4bf57b..0000000000 --- a/webrtc/common_audio/Android.mk +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright (c) 2015 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_common -LOCAL_VENDOR_MODULE := true -LOCAL_MODULE_TAGS := optional -LOCAL_CPP_EXTENSION := .cc -LOCAL_SRC_FILES := \ - audio_converter.cc \ - audio_util.cc \ - blocker.cc \ - channel_buffer.cc \ - fft4g.c \ - fir_filter.cc \ - lapped_transform.cc \ - real_fourier_ooura.cc \ - real_fourier.cc \ - ring_buffer.c \ - audio_ring_buffer.cc \ - sparse_fir_filter.cc \ - window_generator.cc \ - -LOCAL_SRC_FILES_x86 += fir_filter_sse.cc -LOCAL_SRC_FILES_x86_64 += fir_filter_sse.cc - -# Flags passed to both C and C++ files. -LOCAL_CFLAGS := \ - $(MY_WEBRTC_COMMON_DEFS) - -LOCAL_CFLAGS_arm := $(MY_WEBRTC_COMMON_DEFS_arm) -LOCAL_CFLAGS_x86 := $(MY_WEBRTC_COMMON_DEFS_x86) -LOCAL_CFLAGS_mips := $(MY_WEBRTC_COMMON_DEFS_mips) -LOCAL_CFLAGS_arm64 := $(MY_WEBRTC_COMMON_DEFS_arm64) -LOCAL_CFLAGS_x86_64 := $(MY_WEBRTC_COMMON_DEFS_x86_64) -LOCAL_CFLAGS_mips64 := $(MY_WEBRTC_COMMON_DEFS_mips64) - -LOCAL_CFLAGS += $(MY_WEBRTC_COMMON_CFLAGS_WARNINGS) -LOCAL_TIDY_CHECKS := $(MY_WEBRTC_COMMON_TIDY_CHECKS) - -# Include paths placed before CFLAGS/CPPFLAGS -LOCAL_C_INCLUDES := \ - $(LOCAL_PATH) \ - $(LOCAL_PATH)/../.. \ - -include $(BUILD_STATIC_LIBRARY) diff --git a/webrtc/common_audio/resampler/Android.bp b/webrtc/common_audio/resampler/Android.bp new file mode 100644 index 0000000000..d4408dc8cb --- /dev/null +++ b/webrtc/common_audio/resampler/Android.bp @@ -0,0 +1,35 @@ +// 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. + +cc_library_static { + name: "libwebrtc_resampler", + defaults: ["webrtc_flags"], + + arch: { + x86: { + srcs: ["sinc_resampler_sse.cc"], + }, + x86_64: { + srcs: ["sinc_resampler_sse.cc"], + }, + }, + + srcs: [ + "push_sinc_resampler.cc", + "resampler.cc", + "sinc_resampler.cc", + ], + + local_include_dirs: ["include"], + static_libs: ["libwebrtc_spl"], +} + +filegroup { + name: "webrtc_common_audio_resampler_push_resampler", + srcs: ["push_resampler.cc"], +} diff --git a/webrtc/common_audio/resampler/Android.mk b/webrtc/common_audio/resampler/Android.mk deleted file mode 100644 index 5b788577d2..0000000000 --- a/webrtc/common_audio/resampler/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) - -include $(CLEAR_VARS) - -include $(LOCAL_PATH)/../../../android-webrtc.mk - -LOCAL_ARM_MODE := arm -LOCAL_MODULE_CLASS := STATIC_LIBRARIES -LOCAL_MODULE := libwebrtc_resampler -LOCAL_VENDOR_MODULE := true -LOCAL_MODULE_TAGS := optional -LOCAL_CPP_EXTENSION := .cc -LOCAL_SRC_FILES := \ - push_sinc_resampler.cc \ - resampler.cc \ - sinc_resampler.cc \ - -LOCAL_SRC_FILES_x86 += sinc_resampler_sse.cc -LOCAL_SRC_FILES_x86_64 += sinc_resampler_sse.cc - -# Flags passed to both C and C++ files. -LOCAL_CFLAGS := \ - $(MY_WEBRTC_COMMON_DEFS) - -LOCAL_CFLAGS_arm := $(MY_WEBRTC_COMMON_DEFS_arm) -LOCAL_CFLAGS_x86 := $(MY_WEBRTC_COMMON_DEFS_x86) -LOCAL_CFLAGS_mips := $(MY_WEBRTC_COMMON_DEFS_mips) -LOCAL_CFLAGS_arm64 := $(MY_WEBRTC_COMMON_DEFS_arm64) -LOCAL_CFLAGS_x86_64 := $(MY_WEBRTC_COMMON_DEFS_x86_64) -LOCAL_CFLAGS_mips64 := $(MY_WEBRTC_COMMON_DEFS_mips64) - -LOCAL_CFLAGS += $(MY_WEBRTC_COMMON_CFLAGS_WARNINGS) -LOCAL_TIDY_CHECKS := $(MY_WEBRTC_COMMON_TIDY_CHECKS) - -LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/include \ - $(LOCAL_PATH)/../../.. \ - $(LOCAL_PATH)/../signal_processing/include - -include $(BUILD_STATIC_LIBRARY) diff --git a/webrtc/common_audio/signal_processing/Android.bp b/webrtc/common_audio/signal_processing/Android.bp new file mode 100644 index 0000000000..77a5c5b9ab --- /dev/null +++ b/webrtc/common_audio/signal_processing/Android.bp @@ -0,0 +1,80 @@ +// 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. + +cc_library_static { + name: "libwebrtc_spl", + defaults: ["webrtc_flags"], + + arch: { + arm: { + srcs: [ + "complex_bit_reverse_arm.S", + "spl_sqrt_floor_arm.S", + + // Some new .s files have compilation error with AOSP configuration, + // so they are not used. The next merge of upstream .S file might work. + // "cross_correlation_neon.s", + // "downsample_fast_neon.s", + // "min_max_operations_neon.s", + // "vector_scaling_operations_neon.s", + + // "filter_ar_fast_q12_armv7.S", + ], + exclude_srcs: [ + "complex_bit_reverse.c", + "spl_sqrt_floor.c", + + // "cross_correlation.c", + // "downsample_fast.c", + + //"filter_ar_fast_q12.c", + ], + }, + }, + + srcs: [ + "auto_corr_to_refl_coef.c", + "auto_correlation.c", + "complex_fft.c", + "copy_set_operations.c", + "division_operations.c", + "dot_product_with_scale.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", + "splitting_filter.c", + "sqrt_of_one_minus_x_squared.c", + "vector_scaling_operations.c", + + // These are replaced by assembly for arm builds + "complex_bit_reverse.c", + "spl_sqrt_floor.c", + + "filter_ar_fast_q12.c", + "cross_correlation.c", + "downsample_fast.c", + ], + + export_include_dirs: ["include"], +} diff --git a/webrtc/common_audio/signal_processing/Android.mk b/webrtc/common_audio/signal_processing/Android.mk deleted file mode 100644 index 8f4b8cbb3a..0000000000 --- a/webrtc/common_audio/signal_processing/Android.mk +++ /dev/null @@ -1,102 +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_VENDOR_MODULE := true -LOCAL_MODULE_TAGS := optional -LOCAL_SRC_FILES := \ - auto_corr_to_refl_coef.c \ - auto_correlation.c \ - complex_fft.c \ - copy_set_operations.c \ - division_operations.c \ - dot_product_with_scale.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 \ - 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_CFLAGS_arm := $(MY_WEBRTC_COMMON_DEFS_arm) -LOCAL_CFLAGS_x86 := $(MY_WEBRTC_COMMON_DEFS_x86) -LOCAL_CFLAGS_mips := $(MY_WEBRTC_COMMON_DEFS_mips) -LOCAL_CFLAGS_arm64 := $(MY_WEBRTC_COMMON_DEFS_arm64) -LOCAL_CFLAGS_x86_64 := $(MY_WEBRTC_COMMON_DEFS_x86_64) -LOCAL_CFLAGS_mips64 := $(MY_WEBRTC_COMMON_DEFS_mips64) - -LOCAL_CFLAGS += $(MY_WEBRTC_COMMON_CFLAGS_WARNINGS) -LOCAL_TIDY_CHECKS := $(MY_WEBRTC_COMMON_TIDY_CHECKS) - -LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/include \ - $(LOCAL_PATH)/../../.. - -# Some new .s files have compilation error with AOSP configuration, -# so they are not used. The next merge of upstream .S file might work. -#ifeq ($(ARCH_ARM_HAVE_NEON),true) -#LOCAL_SRC_FILES += \ -# cross_correlation_neon.s \ -# downsample_fast_neon.s \ -# min_max_operations_neon.s \ -# vector_scaling_operations_neon.s -#LOCAL_CFLAGS += \ -# $(MY_ARM_CFLAGS_NEON) -#else -LOCAL_SRC_FILES += \ - cross_correlation.c \ - downsample_fast.c -#endif - -#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 - -include $(BUILD_STATIC_LIBRARY) diff --git a/webrtc/common_audio/vad/Android.bp b/webrtc/common_audio/vad/Android.bp new file mode 100644 index 0000000000..655de82aea --- /dev/null +++ b/webrtc/common_audio/vad/Android.bp @@ -0,0 +1,23 @@ +// 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. + +cc_library_static { + name: "libwebrtc_vad", + defaults: ["webrtc_flags"], + + srcs: [ + "webrtc_vad.c", + "vad_core.c", + "vad_filterbank.c", + "vad_gmm.c", + "vad_sp.c", + ], + + export_include_dirs: ["include"], + static_libs: ["libwebrtc_spl"], +} diff --git a/webrtc/common_audio/vad/Android.mk b/webrtc/common_audio/vad/Android.mk deleted file mode 100644 index 6f5c781317..0000000000 --- a/webrtc/common_audio/vad/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_vad -LOCAL_VENDOR_MODULE := true -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_CFLAGS_arm := $(MY_WEBRTC_COMMON_DEFS_arm) -LOCAL_CFLAGS_x86 := $(MY_WEBRTC_COMMON_DEFS_x86) -LOCAL_CFLAGS_mips := $(MY_WEBRTC_COMMON_DEFS_mips) -LOCAL_CFLAGS_arm64 := $(MY_WEBRTC_COMMON_DEFS_arm64) -LOCAL_CFLAGS_x86_64 := $(MY_WEBRTC_COMMON_DEFS_x86_64) -LOCAL_CFLAGS_mips64 := $(MY_WEBRTC_COMMON_DEFS_mips64) - -LOCAL_CFLAGS += $(MY_WEBRTC_COMMON_CFLAGS_WARNINGS) -LOCAL_TIDY_CHECKS := $(MY_WEBRTC_COMMON_TIDY_CHECKS) - -LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/include \ - $(LOCAL_PATH)/../../.. \ - $(LOCAL_PATH)/../signal_processing/include - -include $(BUILD_STATIC_LIBRARY) diff --git a/webrtc/modules/Android.bp b/webrtc/modules/Android.bp new file mode 100644 index 0000000000..a3366163f4 --- /dev/null +++ b/webrtc/modules/Android.bp @@ -0,0 +1,10 @@ +subdirs = [ + "audio_coding/codecs/isac/fix", + "audio_coding/codecs/isac/main", + "audio_processing", +] + +cc_library_headers { + name: "libwebrtc_modules_headers", + export_include_dirs: ["include"], +} diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/Android.bp b/webrtc/modules/audio_coding/codecs/isac/fix/Android.bp new file mode 100644 index 0000000000..374d1b13cf --- /dev/null +++ b/webrtc/modules/audio_coding/codecs/isac/fix/Android.bp @@ -0,0 +1,6 @@ +subdirs = ["*"] + +cc_library_headers { + name: "libwebrtc_isacfix_headers", + export_include_dirs: ["include"], +} diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/Android.bp b/webrtc/modules/audio_coding/codecs/isac/fix/source/Android.bp new file mode 100644 index 0000000000..78a56619b9 --- /dev/null +++ b/webrtc/modules/audio_coding/codecs/isac/fix/source/Android.bp @@ -0,0 +1,66 @@ +// 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. + +cc_library_static { + name: "libwebrtc_isacfix", + defaults: ["webrtc_flags"], + + arch: { + arm: { + // Using .S (instead of .s) extention is to include a C header file in assembly. + srcs: [ + "lattice_armv7.S", + "pitch_filter_armv6.S", + ], + exclude_srcs: [ + "lattice_c.c", + "pitch_filter_c.c", + ], + }, + mips: { + // TODO: Use pitch_estimator_mips.c for mips, pitch_estimator_c.c + }, + }, + + srcs: [ + "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_estimator_c.c", + "pitch_filter.c", + "pitch_gain_tables.c", + "pitch_lag_tables.c", + "spectrum_ar_model_tables.c", + "transform_tables.c", + "transform.c", + + // These are replaced by assembly versions in arm builds + "lattice_c.c", + "pitch_filter_c.c", + ], + + header_libs: ["libwebrtc_isacfix_headers"], + export_header_lib_headers: ["libwebrtc_isacfix_headers"], + static_libs: ["libwebrtc_spl"], +} diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/Android.mk b/webrtc/modules/audio_coding/codecs/isac/fix/source/Android.mk deleted file mode 100644 index cac1b2a0cf..0000000000 --- a/webrtc/modules/audio_coding/codecs/isac/fix/source/Android.mk +++ /dev/null @@ -1,83 +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_isacfix -LOCAL_VENDOR_MODULE := true -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_estimator_c.c \ - pitch_filter.c \ - pitch_gain_tables.c \ - pitch_lag_tables.c \ - spectrum_ar_model_tables.c \ - transform_tables.c \ - transform.c - -# TODO: Use pitch_estimator_mips.c for mips, pitch_estimator_c.c - -# Using .S (instead of .s) extention is to include a C header file in assembly. -my_as_src := \ - lattice_armv7.S \ - pitch_filter_armv6.S -my_c_src := \ - lattice_c.c \ - pitch_filter_c.c -LOCAL_SRC_FILES_arm += $(my_as_src) -LOCAL_SRC_FILES_x86 += $(my_c_src) -LOCAL_SRC_FILES_mips += $(my_c_src) -LOCAL_SRC_FILES_arm64 += $(my_c_src) -LOCAL_SRC_FILES_x86_64 += $(my_c_src) -LOCAL_SRC_FILES_mips64 += $(my_c_src) - -# Flags passed to both C and C++ files. -LOCAL_CFLAGS := \ - $(MY_WEBRTC_COMMON_DEFS) - -LOCAL_CFLAGS_arm := $(MY_WEBRTC_COMMON_DEFS_arm) -LOCAL_CFLAGS_x86 := $(MY_WEBRTC_COMMON_DEFS_x86) -LOCAL_CFLAGS_mips := $(MY_WEBRTC_COMMON_DEFS_mips) -LOCAL_CFLAGS_arm64 := $(MY_WEBRTC_COMMON_DEFS_arm64) -LOCAL_CFLAGS_x86_64 := $(MY_WEBRTC_COMMON_DEFS_x86_64) -LOCAL_CFLAGS_mips64 := $(MY_WEBRTC_COMMON_DEFS_mips64) - -LOCAL_CFLAGS += $(MY_WEBRTC_COMMON_CFLAGS_WARNINGS) -LOCAL_TIDY_CHECKS := $(MY_WEBRTC_COMMON_TIDY_CHECKS) - -LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/../interface \ - $(LOCAL_PATH)/../../../../../../.. \ - $(LOCAL_PATH)/../../../../../../common_audio/signal_processing/include - -include $(BUILD_STATIC_LIBRARY) diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/test/Android.bp b/webrtc/modules/audio_coding/codecs/isac/fix/test/Android.bp new file mode 100644 index 0000000000..577744cbe4 --- /dev/null +++ b/webrtc/modules/audio_coding/codecs/isac/fix/test/Android.bp @@ -0,0 +1,28 @@ +// 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. + +cc_test { + name: "webrtc_isac_test", + defaults: ["webrtc_flags"], + + srcs: ["kenny.cc"], + + static_libs: [ + "libwebrtc_isacfix", + "libwebrtc_spl", + "libwebrtc_system_wrappers", + ], + + shared_libs: ["libutils"], + + arch: { + arm: { + instruction_set: "thumb", + }, + }, +} diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/test/Android.mk b/webrtc/modules/audio_coding/codecs/isac/fix/test/Android.mk deleted file mode 100644 index 161ade83cf..0000000000 --- a/webrtc/modules/audio_coding/codecs/isac/fix/test/Android.mk +++ /dev/null @@ -1,47 +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. - -########################### -# isac test app - -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_MODULE_TAGS := tests -LOCAL_CPP_EXTENSION := .cc -LOCAL_SRC_FILES:= kenny.cc - -# Flags passed to both C and C++ files. -LOCAL_CFLAGS := $(MY_WEBRTC_COMMON_DEFS) - -LOCAL_CFLAGS_arm := $(MY_WEBRTC_COMMON_DEFS_arm) -LOCAL_CFLAGS_x86 := $(MY_WEBRTC_COMMON_DEFS_x86) -LOCAL_CFLAGS_mips := $(MY_WEBRTC_COMMON_DEFS_mips) -LOCAL_CFLAGS_arm64 := $(MY_WEBRTC_COMMON_DEFS_arm64) -LOCAL_CFLAGS_x86_64 := $(MY_WEBRTC_COMMON_DEFS_x86_64) -LOCAL_CFLAGS_mips64 := $(MY_WEBRTC_COMMON_DEFS_mips64) - -LOCAL_CFLAGS += $(MY_WEBRTC_COMMON_CFLAGS_WARNINGS) -LOCAL_TIDY_CHECKS := $(MY_WEBRTC_COMMON_TIDY_CHECKS) - -LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/../include \ - $(LOCAL_PATH)/../../../../../../.. - -LOCAL_STATIC_LIBRARIES := \ - libwebrtc_isacfix \ - libwebrtc_spl \ - libwebrtc_system_wrappers - -LOCAL_SHARED_LIBRARIES := \ - libutils - -LOCAL_MODULE := webrtc_isac_test - -include $(BUILD_NATIVE_TEST) diff --git a/webrtc/modules/audio_coding/codecs/isac/main/Android.bp b/webrtc/modules/audio_coding/codecs/isac/main/Android.bp new file mode 100644 index 0000000000..19801687a5 --- /dev/null +++ b/webrtc/modules/audio_coding/codecs/isac/main/Android.bp @@ -0,0 +1,6 @@ +subdirs = ["source"] + +cc_library_headers { + name: "libwebrtc_isac_interface", + export_include_dirs: ["include"], +} diff --git a/webrtc/modules/audio_coding/codecs/isac/main/source/Android.bp b/webrtc/modules/audio_coding/codecs/isac/main/source/Android.bp new file mode 100644 index 0000000000..dab60c4034 --- /dev/null +++ b/webrtc/modules/audio_coding/codecs/isac/main/source/Android.bp @@ -0,0 +1,46 @@ +// 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. + +cc_library_static { + name: "libwebrtc_isac", + defaults: ["webrtc_flags"], + + srcs: [ + "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", + "filterbanks.c", + "intialize.c", + "isac.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", + ], + + header_libs: ["libwebrtc_isac_interface"], + static_libs: ["libwebrtc_spl"], +} diff --git a/webrtc/modules/audio_coding/codecs/isac/main/source/Android.mk b/webrtc/modules/audio_coding/codecs/isac/main/source/Android.mk deleted file mode 100644 index b5f5415b80..0000000000 --- a/webrtc/modules/audio_coding/codecs/isac/main/source/Android.mk +++ /dev/null @@ -1,69 +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_VENDOR_MODULE := true -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 \ - filterbanks.c \ - intialize.c \ - isac.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_CFLAGS_arm := $(MY_WEBRTC_COMMON_DEFS_arm) -LOCAL_CFLAGS_x86 := $(MY_WEBRTC_COMMON_DEFS_x86) -LOCAL_CFLAGS_mips := $(MY_WEBRTC_COMMON_DEFS_mips) -LOCAL_CFLAGS_arm64 := $(MY_WEBRTC_COMMON_DEFS_arm64) -LOCAL_CFLAGS_x86_64 := $(MY_WEBRTC_COMMON_DEFS_x86_64) -LOCAL_CFLAGS_mips64 := $(MY_WEBRTC_COMMON_DEFS_mips64) - -LOCAL_CFLAGS += $(MY_WEBRTC_COMMON_CFLAGS_WARNINGS) -LOCAL_TIDY_CHECKS := $(MY_WEBRTC_COMMON_TIDY_CHECKS) - -LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/../include \ - $(LOCAL_PATH)/../../../../../../.. \ - $(LOCAL_PATH)/../../../../../../common_audio/signal_processing/include - -include $(BUILD_STATIC_LIBRARY) diff --git a/webrtc/modules/audio_processing/Android.bp b/webrtc/modules/audio_processing/Android.bp new file mode 100644 index 0000000000..618387c1da --- /dev/null +++ b/webrtc/modules/audio_processing/Android.bp @@ -0,0 +1,114 @@ +// 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. + +subdirs = ["*"] + +cc_library_static { + name: "libwebrtc_apm", + defaults: ["webrtc_flags"], + + srcs: [ + "./**/*.proto", + "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", + "rms_level.cc", + "splitting_filter.cc", + "three_band_filter_bank.cc", + "processing_component.cc", + "voice_detection_impl.cc", + ], + + cflags: [ + "-DWEBRTC_NS_FIXED", + "-DWEBRTC_ANDROID_PLATFORM_BUILD", + "-DWEBRTC_AUDIOPROC_DEBUG_DUMP", + + // floating point + // "-DWEBRTC_NS_FLOAT", + ], + + local_include_dirs: ["include"], + header_libs: ["libwebrtc_modules_headers"], + static_libs: [ + "libwebrtc_spl", + "libwebrtc_vad", + "libwebrtc_system_wrappers", + ], +} + +// apm process test app +cc_test { + name: "webrtc_apm_process_test", + defaults: ["webrtc_flags"], + + srcs: [ + "**/*.proto", + "test/process_test.cc", + "test/test_utils.cc", + "test/protobuf_utils.cc", + ":webrtc_common_audio_wav", + ":webrtc_system_wrappers_tick_util", + ":webrtc_test_testsupport_fileutils", + ":webrtc_test_testsupport_perf_test", + ], + + cflags: [ + "-DWEBRTC_ANDROID_PLATFORM_BUILD", + "-DWEBRTC_AUDIOPROC_DEBUG_DUMP", + ], + + local_include_dirs: ["include"], + + shared_libs: [ + "libutils", + "libwebrtc_audio_preprocessing", + ], + + arch: { + arm: { + instruction_set: "thumb", + }, + }, +} + +// apm unit test app +cc_test { + name: "webrtc_apm_unit_test", + defaults: ["webrtc_flags"], + + srcs: [ + "**/*.proto", + "test/audio_processing_unittest.cc", + "test/protobuf_utils.cc", + "test/test_utils.cc", + ":webrtc_common_audio_resampler_push_resampler", + ":webrtc_test_testsupport_fileutils", + ], + + cflags: [ + "-DWEBRTC_AUDIOPROC_FIXED_PROFILE", + "-DWEBRTC_ANDROID_PLATFORM_BUILD", + "-DWEBRTC_AUDIOPROC_DEBUG_DUMP", + ], + + local_include_dirs: ["include"], + + shared_libs: ["libwebrtc_audio_preprocessing"], + + arch: { + arm: { + instruction_set: "thumb", + }, + }, +} diff --git a/webrtc/modules/audio_processing/Android.mk b/webrtc/modules/audio_processing/Android.mk deleted file mode 100644 index 3972baad2e..0000000000 --- a/webrtc/modules/audio_processing/Android.mk +++ /dev/null @@ -1,173 +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_VENDOR_MODULE := true -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 \ - rms_level.cc \ - splitting_filter.cc \ - three_band_filter_bank.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_CFLAGS_arm := $(MY_WEBRTC_COMMON_DEFS_arm) -LOCAL_CFLAGS_x86 := $(MY_WEBRTC_COMMON_DEFS_x86) -LOCAL_CFLAGS_mips := $(MY_WEBRTC_COMMON_DEFS_mips) -LOCAL_CFLAGS_arm64 := $(MY_WEBRTC_COMMON_DEFS_arm64) -LOCAL_CFLAGS_x86_64 := $(MY_WEBRTC_COMMON_DEFS_x86_64) -LOCAL_CFLAGS_mips64 := $(MY_WEBRTC_COMMON_DEFS_mips64) - -LOCAL_CFLAGS += $(MY_WEBRTC_COMMON_CFLAGS_WARNINGS) -LOCAL_TIDY_CHECKS := $(MY_WEBRTC_COMMON_TIDY_CHECKS) - -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/include \ - external/protobuf/src - -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 \ - test/test_utils.cc \ - test/protobuf_utils.cc \ - ../../common_audio/wav_file.cc \ - ../../common_audio/wav_header.cc \ - ../../system_wrappers/source/tick_util.cc \ - ../../test/testsupport/fileutils.cc \ - ../../test/testsupport/perf_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_CFLAGS_arm := $(MY_WEBRTC_COMMON_DEFS_arm) -LOCAL_CFLAGS_x86 := $(MY_WEBRTC_COMMON_DEFS_x86) -LOCAL_CFLAGS_mips := $(MY_WEBRTC_COMMON_DEFS_mips) -LOCAL_CFLAGS_arm64 := $(MY_WEBRTC_COMMON_DEFS_arm64) -LOCAL_CFLAGS_x86_64 := $(MY_WEBRTC_COMMON_DEFS_x86_64) -LOCAL_CFLAGS_mips64 := $(MY_WEBRTC_COMMON_DEFS_mips64) - -LOCAL_CFLAGS += $(MY_WEBRTC_COMMON_CFLAGS_WARNINGS) -LOCAL_TIDY_CHECKS := $(MY_WEBRTC_COMMON_TIDY_CHECKS) - -LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/include \ - $(LOCAL_PATH)/../interface \ - $(LOCAL_PATH)/../../.. \ - $(LOCAL_PATH)/../../system_wrappers/include \ - -LOCAL_SHARED_LIBRARIES := \ - libutils \ - libwebrtc_audio_preprocessing \ - -LOCAL_VENDOR_MODULE := true -LOCAL_MODULE := webrtc_apm_process_test - -LOCAL_SHARED_LIBRARIES += libprotobuf-cpp-lite - -include $(BUILD_NATIVE_TEST) - -# apm unit test app - -include $(CLEAR_VARS) - -LOCAL_MODULE_TAGS := tests -LOCAL_CPP_EXTENSION := .cc -LOCAL_SRC_FILES:= \ - $(call all-proto-files-under, .) \ - test/audio_processing_unittest.cc \ - test/protobuf_utils.cc \ - test/test_utils.cc \ - ../../common_audio/resampler/push_resampler.cc \ - ../../test/testsupport/fileutils.cc - -LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/../../.. \ - -# 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_CFLAGS_arm := $(MY_WEBRTC_COMMON_DEFS_arm) -LOCAL_CFLAGS_x86 := $(MY_WEBRTC_COMMON_DEFS_x86) -LOCAL_CFLAGS_mips := $(MY_WEBRTC_COMMON_DEFS_mips) -LOCAL_CFLAGS_arm64 := $(MY_WEBRTC_COMMON_DEFS_arm64) -LOCAL_CFLAGS_x86_64 := $(MY_WEBRTC_COMMON_DEFS_x86_64) -LOCAL_CFLAGS_mips64 := $(MY_WEBRTC_COMMON_DEFS_mips64) - -LOCAL_CFLAGS += $(MY_WEBRTC_COMMON_CFLAGS_WARNINGS) -LOCAL_TIDY_CHECKS := $(MY_WEBRTC_COMMON_TIDY_CHECKS) - -LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/include \ - $(LOCAL_PATH)/../interface \ - $(LOCAL_PATH)/../.. \ - $(LOCAL_PATH)/../../.. \ - $(LOCAL_PATH)/../../../test \ - $(LOCAL_PATH)/../../system_wrappers/include \ - $(LOCAL_PATH)/../../../webrtc/base \ - $(LOCAL_PATH)/../../common_audio/signal_processing/include \ - external/protobuf/src - -LOCAL_SHARED_LIBRARIES := \ - libwebrtc_audio_preprocessing - -LOCAL_VENDOR_MODULE := true -LOCAL_MODULE := webrtc_apm_unit_test - -LOCAL_SHARED_LIBRARIES += libprotobuf-cpp-lite - -include $(BUILD_NATIVE_TEST) diff --git a/webrtc/modules/audio_processing/aec/Android.bp b/webrtc/modules/audio_processing/aec/Android.bp new file mode 100644 index 0000000000..3e8a4f9e36 --- /dev/null +++ b/webrtc/modules/audio_processing/aec/Android.bp @@ -0,0 +1,42 @@ +// 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. + +cc_library_static { + name: "libwebrtc_aec", + defaults: ["webrtc_flags"], + + srcs: [ + "echo_cancellation.c", + "aec_resampler.c", + "aec_core.c", + "aec_rdft.c", + ], + + arch: { + arm: { + instruction_set: "thumb", + }, + x86: { + srcs: [ + "aec_core_sse2.c", + "aec_rdft_sse2.c", + ], + }, + x86_64: { + srcs: [ + "aec_core_sse2.c", + "aec_rdft_sse2.c", + ], + }, + }, + + static_libs: [ + "libwebrtc_apm_utility", + "libwebrtc_spl", + ], +} diff --git a/webrtc/modules/audio_processing/aec/Android.mk b/webrtc/modules/audio_processing/aec/Android.mk deleted file mode 100644 index 1d5b900cf2..0000000000 --- a/webrtc/modules/audio_processing/aec/Android.mk +++ /dev/null @@ -1,51 +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_VENDOR_MODULE := true -LOCAL_MODULE_TAGS := optional -LOCAL_SRC_FILES := \ - echo_cancellation.c \ - aec_resampler.c \ - aec_core.c \ - aec_rdft.c \ - -ifeq ($(TARGET_ARCH),$(filter $(TARGET_ARCH),x86 x86_64)) -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_CFLAGS_arm := $(MY_WEBRTC_COMMON_DEFS_arm) -LOCAL_CFLAGS_x86 := $(MY_WEBRTC_COMMON_DEFS_x86) -LOCAL_CFLAGS_mips := $(MY_WEBRTC_COMMON_DEFS_mips) -LOCAL_CFLAGS_arm64 := $(MY_WEBRTC_COMMON_DEFS_arm64) -LOCAL_CFLAGS_x86_64 := $(MY_WEBRTC_COMMON_DEFS_x86_64) -LOCAL_CFLAGS_mips64 := $(MY_WEBRTC_COMMON_DEFS_mips64) - -LOCAL_CFLAGS += $(MY_WEBRTC_COMMON_CFLAGS_WARNINGS) -LOCAL_TIDY_CHECKS := $(MY_WEBRTC_COMMON_TIDY_CHECKS) - -LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/include \ - $(LOCAL_PATH)/../utility \ - $(LOCAL_PATH)/../../../.. \ - $(LOCAL_PATH)/../../../common_audio/signal_processing/include - -include $(BUILD_STATIC_LIBRARY) diff --git a/webrtc/modules/audio_processing/aecm/Android.bp b/webrtc/modules/audio_processing/aecm/Android.bp new file mode 100644 index 0000000000..b0738eee82 --- /dev/null +++ b/webrtc/modules/audio_processing/aecm/Android.bp @@ -0,0 +1,25 @@ +// 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. + +cc_library_static { + name: "libwebrtc_aecm", + defaults: ["webrtc_flags"], + + // TODO: use aecm_core_mips.c for mips, aecm_core_c.c + srcs: [ + "echo_control_mobile.c", + "aecm_core.c", + "aecm_core_c.c", + ], + + static_libs: [ + "libwebrtc_apm_utility", + "libwebrtc_spl", + "libwebrtc_system_wrappers", + ], +} diff --git a/webrtc/modules/audio_processing/aecm/Android.mk b/webrtc/modules/audio_processing/aecm/Android.mk deleted file mode 100644 index 2bf7ac65f9..0000000000 --- a/webrtc/modules/audio_processing/aecm/Android.mk +++ /dev/null @@ -1,49 +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_aecm -LOCAL_VENDOR_MODULE := true -LOCAL_MODULE_TAGS := optional -LOCAL_SRC_FILES := \ - echo_control_mobile.c \ - aecm_core.c \ - aecm_core_c.c - -# TODO: use aecm_core_mips.c for mips, aecm_core_c.c - -# Flags passed to both C and C++ files. -LOCAL_CFLAGS := $(MY_WEBRTC_COMMON_DEFS) - -LOCAL_CFLAGS_arm := $(MY_WEBRTC_COMMON_DEFS_arm) -LOCAL_CFLAGS_x86 := $(MY_WEBRTC_COMMON_DEFS_x86) -LOCAL_CFLAGS_mips := $(MY_WEBRTC_COMMON_DEFS_mips) -LOCAL_CFLAGS_arm64 := $(MY_WEBRTC_COMMON_DEFS_arm64) -LOCAL_CFLAGS_x86_64 := $(MY_WEBRTC_COMMON_DEFS_x86_64) -LOCAL_CFLAGS_mips64 := $(MY_WEBRTC_COMMON_DEFS_mips64) - -LOCAL_CFLAGS += $(MY_WEBRTC_COMMON_CFLAGS_WARNINGS) -LOCAL_TIDY_CHECKS := $(MY_WEBRTC_COMMON_TIDY_CHECKS) - -LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/include \ - $(LOCAL_PATH)/../utility \ - $(LOCAL_PATH)/../../../.. \ - $(LOCAL_PATH)/../../../common_audio/signal_processing/include \ - $(LOCAL_PATH)/../../../system_wrappers/interface - -LOCAL_STATIC_LIBRARIES += libwebrtc_system_wrappers - -include $(BUILD_STATIC_LIBRARY) diff --git a/webrtc/modules/audio_processing/agc/Android.bp b/webrtc/modules/audio_processing/agc/Android.bp new file mode 100644 index 0000000000..b4e6284b42 --- /dev/null +++ b/webrtc/modules/audio_processing/agc/Android.bp @@ -0,0 +1,24 @@ +// 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. + +cc_library_static { + name: "libwebrtc_agc", + defaults: ["webrtc_flags"], + + srcs: [ + "agc.cc", + "agc_manager_direct.cc", + "histogram.cc", + "utility.cc", + // TODO: do not use legacy/*.c? + "legacy/analog_agc.c", + "legacy/digital_agc.c", + ], + + static_libs: ["libwebrtc_spl"], +} diff --git a/webrtc/modules/audio_processing/agc/Android.mk b/webrtc/modules/audio_processing/agc/Android.mk deleted file mode 100644 index 9b46d51cb9..0000000000 --- a/webrtc/modules/audio_processing/agc/Android.mk +++ /dev/null @@ -1,50 +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_agc -LOCAL_VENDOR_MODULE := true -LOCAL_MODULE_TAGS := optional -LOCAL_CPP_EXTENSION := .cc -LOCAL_SRC_FILES := \ - agc.cc \ - agc_manager_direct.cc \ - histogram.cc \ - utility.cc \ - legacy/analog_agc.c \ - legacy/digital_agc.c \ - -# TODO: do not use legacy/*.c? - -# Flags passed to both C and C++ files. -LOCAL_CFLAGS := \ - $(MY_WEBRTC_COMMON_DEFS) - -LOCAL_CFLAGS_arm := $(MY_WEBRTC_COMMON_DEFS_arm) -LOCAL_CFLAGS_x86 := $(MY_WEBRTC_COMMON_DEFS_x86) -LOCAL_CFLAGS_mips := $(MY_WEBRTC_COMMON_DEFS_mips) -LOCAL_CFLAGS_arm64 := $(MY_WEBRTC_COMMON_DEFS_arm64) -LOCAL_CFLAGS_x86_64 := $(MY_WEBRTC_COMMON_DEFS_x86_64) -LOCAL_CFLAGS_mips64 := $(MY_WEBRTC_COMMON_DEFS_mips64) - -LOCAL_CFLAGS += $(MY_WEBRTC_COMMON_CFLAGS_WARNINGS) -LOCAL_TIDY_CHECKS := $(MY_WEBRTC_COMMON_TIDY_CHECKS) - -LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/include \ - $(LOCAL_PATH)/../../../.. \ - $(LOCAL_PATH)/../../../common_audio/signal_processing/include - -include $(BUILD_STATIC_LIBRARY) diff --git a/webrtc/modules/audio_processing/beamformer/Android.bp b/webrtc/modules/audio_processing/beamformer/Android.bp new file mode 100644 index 0000000000..a13ba075dd --- /dev/null +++ b/webrtc/modules/audio_processing/beamformer/Android.bp @@ -0,0 +1,18 @@ +// Copyright (c) 2015 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. + +cc_library_static { + name: "libwebrtc_beamformer", + defaults: ["webrtc_flags"], + + srcs: [ + "array_util.cc", + "covariance_matrix_generator.cc", + "nonlinear_beamformer.cc", + ], +} diff --git a/webrtc/modules/audio_processing/beamformer/Android.mk b/webrtc/modules/audio_processing/beamformer/Android.mk deleted file mode 100644 index 4f20566b94..0000000000 --- a/webrtc/modules/audio_processing/beamformer/Android.mk +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright (c) 2015 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_beamformer -LOCAL_VENDOR_MODULE := true -LOCAL_MODULE_TAGS := optional -LOCAL_CPP_EXTENSION := .cc -LOCAL_SRC_FILES := \ - array_util.cc \ - covariance_matrix_generator.cc \ - nonlinear_beamformer.cc \ - -# Flags passed to both C and C++ files. -LOCAL_CFLAGS := \ - $(MY_WEBRTC_COMMON_DEFS) - -LOCAL_CFLAGS_arm := $(MY_WEBRTC_COMMON_DEFS_arm) -LOCAL_CFLAGS_x86 := $(MY_WEBRTC_COMMON_DEFS_x86) -LOCAL_CFLAGS_mips := $(MY_WEBRTC_COMMON_DEFS_mips) -LOCAL_CFLAGS_arm64 := $(MY_WEBRTC_COMMON_DEFS_arm64) -LOCAL_CFLAGS_x86_64 := $(MY_WEBRTC_COMMON_DEFS_x86_64) -LOCAL_CFLAGS_mips64 := $(MY_WEBRTC_COMMON_DEFS_mips64) - -LOCAL_CFLAGS += $(MY_WEBRTC_COMMON_CFLAGS_WARNINGS) -LOCAL_TIDY_CHECKS := $(MY_WEBRTC_COMMON_TIDY_CHECKS) - -# Include paths placed before CFLAGS/CPPFLAGS -LOCAL_C_INCLUDES := \ - $(LOCAL_PATH) \ - $(LOCAL_PATH)/../../../.. \ - -include $(BUILD_STATIC_LIBRARY) diff --git a/webrtc/modules/audio_processing/intelligibility/Android.bp b/webrtc/modules/audio_processing/intelligibility/Android.bp new file mode 100644 index 0000000000..78f224402e --- /dev/null +++ b/webrtc/modules/audio_processing/intelligibility/Android.bp @@ -0,0 +1,17 @@ +// Copyright (c) 2015 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. + +cc_library_static { + name: "libwebrtc_intell", + defaults: ["webrtc_flags"], + + srcs: [ + "intelligibility_enhancer.cc", + "intelligibility_utils.cc", + ], +} diff --git a/webrtc/modules/audio_processing/intelligibility/Android.mk b/webrtc/modules/audio_processing/intelligibility/Android.mk deleted file mode 100644 index 9ad048b50d..0000000000 --- a/webrtc/modules/audio_processing/intelligibility/Android.mk +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright (c) 2015 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_intell -LOCAL_VENDOR_MODULE := true -LOCAL_MODULE_TAGS := optional -LOCAL_CPP_EXTENSION := .cc -LOCAL_SRC_FILES := \ - intelligibility_enhancer.cc \ - intelligibility_utils.cc \ - -# Flags passed to both C and C++ files. -LOCAL_CFLAGS := \ - $(MY_WEBRTC_COMMON_DEFS) - -LOCAL_CFLAGS_arm := $(MY_WEBRTC_COMMON_DEFS_arm) -LOCAL_CFLAGS_x86 := $(MY_WEBRTC_COMMON_DEFS_x86) -LOCAL_CFLAGS_mips := $(MY_WEBRTC_COMMON_DEFS_mips) -LOCAL_CFLAGS_arm64 := $(MY_WEBRTC_COMMON_DEFS_arm64) -LOCAL_CFLAGS_x86_64 := $(MY_WEBRTC_COMMON_DEFS_x86_64) -LOCAL_CFLAGS_mips64 := $(MY_WEBRTC_COMMON_DEFS_mips64) - -LOCAL_CFLAGS += $(MY_WEBRTC_COMMON_CFLAGS_WARNINGS) -LOCAL_TIDY_CHECKS := $(MY_WEBRTC_COMMON_TIDY_CHECKS) - -# Include paths placed before CFLAGS/CPPFLAGS -LOCAL_C_INCLUDES := \ - $(LOCAL_PATH) \ - $(LOCAL_PATH)/../../../.. \ - -include $(BUILD_STATIC_LIBRARY) diff --git a/webrtc/modules/audio_processing/ns/Android.bp b/webrtc/modules/audio_processing/ns/Android.bp new file mode 100644 index 0000000000..fb22c3c765 --- /dev/null +++ b/webrtc/modules/audio_processing/ns/Android.bp @@ -0,0 +1,35 @@ +// 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. + +cc_library_static { + name: "libwebrtc_ns", + defaults: ["webrtc_flags"], + + srcs: [ + "noise_suppression_x.c", + "nsx_core.c", + "nsx_core_c.c", + + // TODO: nsx_core.S, nsx_core_mips.c + + // Files for floating point. + // noise_suppression.c ns_core.c + ], + + static_libs: [ + "libwebrtc_apm_utility", + "libwebrtc_spl", + "libwebrtc_system_wrappers", + ], + + arch: { + arm: { + instruction_set: "thumb", + }, + }, +} diff --git a/webrtc/modules/audio_processing/ns/Android.mk b/webrtc/modules/audio_processing/ns/Android.mk deleted file mode 100644 index d76bcc78e0..0000000000 --- a/webrtc/modules/audio_processing/ns/Android.mk +++ /dev/null @@ -1,52 +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_ns -LOCAL_VENDOR_MODULE := true -LOCAL_MODULE_TAGS := optional -LOCAL_GENERATED_SOURCES := -LOCAL_SRC_FILES := \ - noise_suppression_x.c \ - nsx_core.c \ - nsx_core_c.c \ - -# TODO: nsx_core.S, nsx_core_mips.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_CFLAGS_arm := $(MY_WEBRTC_COMMON_DEFS_arm) -LOCAL_CFLAGS_x86 := $(MY_WEBRTC_COMMON_DEFS_x86) -LOCAL_CFLAGS_mips := $(MY_WEBRTC_COMMON_DEFS_mips) -LOCAL_CFLAGS_arm64 := $(MY_WEBRTC_COMMON_DEFS_arm64) -LOCAL_CFLAGS_x86_64 := $(MY_WEBRTC_COMMON_DEFS_x86_64) -LOCAL_CFLAGS_mips64 := $(MY_WEBRTC_COMMON_DEFS_mips64) - -LOCAL_CFLAGS += $(MY_WEBRTC_COMMON_CFLAGS_WARNINGS) -LOCAL_TIDY_CHECKS := $(MY_WEBRTC_COMMON_TIDY_CHECKS) - -LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/include \ - $(LOCAL_PATH)/../utility \ - $(LOCAL_PATH)/../../../.. \ - $(LOCAL_PATH)/../../../common_audio/signal_processing/include \ - $(LOCAL_PATH)/../../../system_wrappers/interface - -LOCAL_STATIC_LIBRARIES += libwebrtc_system_wrappers - -include $(BUILD_STATIC_LIBRARY) diff --git a/webrtc/modules/audio_processing/transient/Android.bp b/webrtc/modules/audio_processing/transient/Android.bp new file mode 100644 index 0000000000..68cb980c29 --- /dev/null +++ b/webrtc/modules/audio_processing/transient/Android.bp @@ -0,0 +1,20 @@ +// Copyright (c) 2015 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. + +cc_library_static { + name: "libwebrtc_transient", + defaults: ["webrtc_flags"], + + srcs: [ + "moving_moments.cc", + "transient_detector.cc", + "transient_suppressor.cc", + "wpd_node.cc", + "wpd_tree.cc", + ], +} diff --git a/webrtc/modules/audio_processing/transient/Android.mk b/webrtc/modules/audio_processing/transient/Android.mk deleted file mode 100644 index 7534a77ef5..0000000000 --- a/webrtc/modules/audio_processing/transient/Android.mk +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright (c) 2015 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_transient -LOCAL_VENDOR_MODULE := true -LOCAL_MODULE_TAGS := optional -LOCAL_CPP_EXTENSION := .cc -LOCAL_SRC_FILES := \ - moving_moments.cc \ - transient_detector.cc \ - transient_suppressor.cc \ - wpd_node.cc \ - wpd_tree.cc \ - -# Flags passed to both C and C++ files. -LOCAL_CFLAGS := \ - $(MY_WEBRTC_COMMON_DEFS) - -LOCAL_CFLAGS_arm := $(MY_WEBRTC_COMMON_DEFS_arm) -LOCAL_CFLAGS_x86 := $(MY_WEBRTC_COMMON_DEFS_x86) -LOCAL_CFLAGS_mips := $(MY_WEBRTC_COMMON_DEFS_mips) -LOCAL_CFLAGS_arm64 := $(MY_WEBRTC_COMMON_DEFS_arm64) -LOCAL_CFLAGS_x86_64 := $(MY_WEBRTC_COMMON_DEFS_x86_64) -LOCAL_CFLAGS_mips64 := $(MY_WEBRTC_COMMON_DEFS_mips64) - -LOCAL_CFLAGS += $(MY_WEBRTC_COMMON_CFLAGS_WARNINGS) -LOCAL_TIDY_CHECKS := $(MY_WEBRTC_COMMON_TIDY_CHECKS) - -# Include paths placed before CFLAGS/CPPFLAGS -LOCAL_C_INCLUDES := \ - $(LOCAL_PATH) \ - $(LOCAL_PATH)/../../../.. \ - -include $(BUILD_STATIC_LIBRARY) diff --git a/webrtc/modules/audio_processing/utility/Android.bp b/webrtc/modules/audio_processing/utility/Android.bp new file mode 100644 index 0000000000..24f1aecd01 --- /dev/null +++ b/webrtc/modules/audio_processing/utility/Android.bp @@ -0,0 +1,20 @@ +// 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. + +cc_library_static { + name: "libwebrtc_apm_utility", + defaults: ["webrtc_flags"], + + srcs: [ + "delay_estimator.c", + "delay_estimator_wrapper.c", + ], + + export_include_dirs: ["."], + static_libs: ["libwebrtc_spl"], +} diff --git a/webrtc/modules/audio_processing/utility/Android.mk b/webrtc/modules/audio_processing/utility/Android.mk deleted file mode 100644 index c545436e46..0000000000 --- a/webrtc/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_VENDOR_MODULE := true -LOCAL_MODULE_TAGS := optional -LOCAL_SRC_FILES := \ - delay_estimator.c \ - delay_estimator_wrapper.c - -# Flags passed to both C and C++ files. -LOCAL_CFLAGS := \ - $(MY_WEBRTC_COMMON_DEFS) - -LOCAL_CFLAGS_arm := $(MY_WEBRTC_COMMON_DEFS_arm) -LOCAL_CFLAGS_x86 := $(MY_WEBRTC_COMMON_DEFS_x86) -LOCAL_CFLAGS_mips := $(MY_WEBRTC_COMMON_DEFS_mips) -LOCAL_CFLAGS_arm64 := $(MY_WEBRTC_COMMON_DEFS_arm64) -LOCAL_CFLAGS_x86_64 := $(MY_WEBRTC_COMMON_DEFS_x86_64) -LOCAL_CFLAGS_mips64 := $(MY_WEBRTC_COMMON_DEFS_mips64) - -LOCAL_CFLAGS += $(MY_WEBRTC_COMMON_CFLAGS_WARNINGS) -LOCAL_TIDY_CHECKS := $(MY_WEBRTC_COMMON_TIDY_CHECKS) - -# Include paths placed before CFLAGS/CPPFLAGS -LOCAL_C_INCLUDES := \ - $(LOCAL_PATH) \ - $(LOCAL_PATH)/../../../.. \ - $(LOCAL_PATH)/../../../common_audio/signal_processing/include - -include $(BUILD_STATIC_LIBRARY) diff --git a/webrtc/modules/audio_processing/vad/Android.bp b/webrtc/modules/audio_processing/vad/Android.bp new file mode 100644 index 0000000000..6e67167407 --- /dev/null +++ b/webrtc/modules/audio_processing/vad/Android.bp @@ -0,0 +1,23 @@ +// Copyright (c) 2015 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. + +cc_library_static { + name: "libwebrtc_apvad", + defaults: ["webrtc_flags"], + + srcs: [ + "gmm.cc", + "pitch_based_vad.cc", + "pitch_internal.cc", + "pole_zero_filter.cc", + "standalone_vad.cc", + "vad_audio_proc.cc", + "vad_circular_buffer.cc", + "voice_activity_detector.cc", + ], +} diff --git a/webrtc/modules/audio_processing/vad/Android.mk b/webrtc/modules/audio_processing/vad/Android.mk deleted file mode 100644 index 4c9c00bc23..0000000000 --- a/webrtc/modules/audio_processing/vad/Android.mk +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright (c) 2015 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_apvad -LOCAL_VENDOR_MODULE := true -LOCAL_MODULE_TAGS := optional -LOCAL_CPP_EXTENSION := .cc -LOCAL_SRC_FILES := \ - gmm.cc \ - pitch_based_vad.cc \ - pitch_internal.cc \ - pole_zero_filter.cc \ - standalone_vad.cc \ - vad_audio_proc.cc \ - vad_circular_buffer.cc \ - voice_activity_detector.cc \ - -# Flags passed to both C and C++ files. -LOCAL_CFLAGS := \ - $(MY_WEBRTC_COMMON_DEFS) - -LOCAL_CFLAGS_arm := $(MY_WEBRTC_COMMON_DEFS_arm) -LOCAL_CFLAGS_x86 := $(MY_WEBRTC_COMMON_DEFS_x86) -LOCAL_CFLAGS_mips := $(MY_WEBRTC_COMMON_DEFS_mips) -LOCAL_CFLAGS_arm64 := $(MY_WEBRTC_COMMON_DEFS_arm64) -LOCAL_CFLAGS_x86_64 := $(MY_WEBRTC_COMMON_DEFS_x86_64) -LOCAL_CFLAGS_mips64 := $(MY_WEBRTC_COMMON_DEFS_mips64) - -LOCAL_CFLAGS += $(MY_WEBRTC_COMMON_CFLAGS_WARNINGS) -LOCAL_TIDY_CHECKS := $(MY_WEBRTC_COMMON_TIDY_CHECKS) - -# Include paths placed before CFLAGS/CPPFLAGS -LOCAL_C_INCLUDES := \ - $(LOCAL_PATH) \ - $(LOCAL_PATH)/../../../.. \ - -include $(BUILD_STATIC_LIBRARY) diff --git a/webrtc/system_wrappers/Android.bp b/webrtc/system_wrappers/Android.bp new file mode 100644 index 0000000000..440152bfcb --- /dev/null +++ b/webrtc/system_wrappers/Android.bp @@ -0,0 +1,6 @@ +subdirs = ["source"] + +cc_library_headers { + name: "libwebrtc_system_wrappers_headers", + export_include_dirs: ["include"], +} diff --git a/webrtc/system_wrappers/source/Android.bp b/webrtc/system_wrappers/source/Android.bp new file mode 100644 index 0000000000..ba02a709ed --- /dev/null +++ b/webrtc/system_wrappers/source/Android.bp @@ -0,0 +1,50 @@ +// 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. + +cc_library_static { + name: "libwebrtc_system_wrappers", + defaults: ["webrtc_flags"], + + srcs: [ + "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", + "file_impl.cc", + "logging.cc", + "metrics_default.cc", + "rw_lock.cc", + "trace_impl.cc", + "condition_variable_posix.cc", + "critical_section_posix.cc", + "sleep.cc", + "trace_posix.cc", + "rw_lock_posix.cc", + ], + + cpp_std: "c++0x", + + local_include_dirs: [ + "android", + "spreadsortlib", + ], + header_libs: ["libwebrtc_system_wrappers_headers"], + export_header_lib_headers: ["libwebrtc_system_wrappers_headers"], + + whole_static_libs: ["cpufeatures"], +} + +filegroup { + name: "webrtc_system_wrappers_tick_util", + srcs: ["tick_util.cc"], +} diff --git a/webrtc/system_wrappers/source/Android.mk b/webrtc/system_wrappers/source/Android.mk deleted file mode 100644 index c63c47b37c..0000000000 --- a/webrtc/system_wrappers/source/Android.mk +++ /dev/null @@ -1,62 +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_VENDOR_MODULE := true -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 \ - file_impl.cc \ - logging.cc \ - metrics_default.cc \ - rw_lock.cc \ - trace_impl.cc \ - condition_variable_posix.cc \ - critical_section_posix.cc \ - sleep.cc \ - trace_posix.cc \ - rw_lock_posix.cc \ - -LOCAL_CFLAGS := $(MY_WEBRTC_COMMON_DEFS) -LOCAL_CPPFLAGS := -std=c++0x - -LOCAL_CFLAGS_arm := $(MY_WEBRTC_COMMON_DEFS_arm) -LOCAL_CFLAGS_x86 := $(MY_WEBRTC_COMMON_DEFS_x86) -LOCAL_CFLAGS_mips := $(MY_WEBRTC_COMMON_DEFS_mips) -LOCAL_CFLAGS_arm64 := $(MY_WEBRTC_COMMON_DEFS_arm64) -LOCAL_CFLAGS_x86_64 := $(MY_WEBRTC_COMMON_DEFS_x86_64) -LOCAL_CFLAGS_mips64 := $(MY_WEBRTC_COMMON_DEFS_mips64) - -LOCAL_CFLAGS += $(MY_WEBRTC_COMMON_CFLAGS_WARNINGS) -LOCAL_TIDY_CHECKS := $(MY_WEBRTC_COMMON_TIDY_CHECKS) - -LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/android \ - $(LOCAL_PATH)/../../.. \ - $(LOCAL_PATH)/../interface \ - $(LOCAL_PATH)/spreadsortlib - -LOCAL_WHOLE_STATIC_LIBRARIES += cpufeatures - -include $(BUILD_STATIC_LIBRARY) diff --git a/webrtc/test/Android.bp b/webrtc/test/Android.bp new file mode 100644 index 0000000000..57aef5812d --- /dev/null +++ b/webrtc/test/Android.bp @@ -0,0 +1,9 @@ +filegroup { + name: "webrtc_test_testsupport_fileutils", + srcs: ["testsupport/fileutils.cc"], +} + +filegroup { + name: "webrtc_test_testsupport_perf_test", + srcs: ["testsupport/perf_test.cc"], +} |