diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-04-30 19:41:19 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-04-30 19:41:19 +0000 |
| commit | a15f0aaa6e282bfc3ac58b62eff3e5371c0f9a92 (patch) | |
| tree | 87d35c3d046859e1a1a1c30e82646980971b303f | |
| parent | 3a802b959c8b320b70b62017c073e5959357e755 (diff) | |
| download | webrtc-a15f0aaa6e282bfc3ac58b62eff3e5371c0f9a92.tar.gz | |
Update makefiles after merge of Chromium at 267293
This commit was generated by merge_from_chromium.py.
Change-Id: I8f623093c29bfca9cfb2b6b04e1561516f10117e
34 files changed, 344 insertions, 7222 deletions
diff --git a/modules/NetEq.target.darwin-arm.mk b/modules/NetEq.target.darwin-arm.mk deleted file mode 100644 index f32b25ec..00000000 --- a/modules/NetEq.target.darwin-arm.mk +++ /dev/null @@ -1,348 +0,0 @@ -# This file is generated by gyp; do not edit. - -include $(CLEAR_VARS) - -LOCAL_MODULE_CLASS := STATIC_LIBRARIES -LOCAL_MODULE := third_party_webrtc_modules_NetEq_gyp -LOCAL_MODULE_SUFFIX := .a -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) -gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) -gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) - -# Make sure our deps are built first. -GYP_TARGET_DEPENDENCIES := - -GYP_GENERATED_OUTPUTS := - -# Make sure our deps and generated files are built first. -LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS) - -LOCAL_GENERATED_SOURCES := - -GYP_COPIED_SOURCE_ORIGIN_DIRS := - -LOCAL_SRC_FILES := \ - third_party/webrtc/modules/audio_coding/neteq/accelerate.c \ - third_party/webrtc/modules/audio_coding/neteq/automode.c \ - third_party/webrtc/modules/audio_coding/neteq/bgn_update.c \ - third_party/webrtc/modules/audio_coding/neteq/bufstats_decision.c \ - third_party/webrtc/modules/audio_coding/neteq/cng_internal.c \ - third_party/webrtc/modules/audio_coding/neteq/codec_db.c \ - third_party/webrtc/modules/audio_coding/neteq/correlator.c \ - third_party/webrtc/modules/audio_coding/neteq/dsp.c \ - third_party/webrtc/modules/audio_coding/neteq/dsp_helpfunctions.c \ - third_party/webrtc/modules/audio_coding/neteq/dtmf_buffer.c \ - third_party/webrtc/modules/audio_coding/neteq/dtmf_tonegen.c \ - third_party/webrtc/modules/audio_coding/neteq/expand.c \ - third_party/webrtc/modules/audio_coding/neteq/mcu_address_init.c \ - third_party/webrtc/modules/audio_coding/neteq/mcu_dsp_common.c \ - third_party/webrtc/modules/audio_coding/neteq/mcu_reset.c \ - third_party/webrtc/modules/audio_coding/neteq/merge.c \ - third_party/webrtc/modules/audio_coding/neteq/min_distortion.c \ - third_party/webrtc/modules/audio_coding/neteq/mix_voice_unvoice.c \ - third_party/webrtc/modules/audio_coding/neteq/mute_signal.c \ - third_party/webrtc/modules/audio_coding/neteq/normal.c \ - third_party/webrtc/modules/audio_coding/neteq/packet_buffer.c \ - third_party/webrtc/modules/audio_coding/neteq/peak_detection.c \ - third_party/webrtc/modules/audio_coding/neteq/preemptive_expand.c \ - third_party/webrtc/modules/audio_coding/neteq/random_vector.c \ - third_party/webrtc/modules/audio_coding/neteq/recin.c \ - third_party/webrtc/modules/audio_coding/neteq/recout.c \ - third_party/webrtc/modules/audio_coding/neteq/rtcp.c \ - third_party/webrtc/modules/audio_coding/neteq/rtp.c \ - third_party/webrtc/modules/audio_coding/neteq/set_fs.c \ - third_party/webrtc/modules/audio_coding/neteq/signal_mcu.c \ - third_party/webrtc/modules/audio_coding/neteq/split_and_insert.c \ - third_party/webrtc/modules/audio_coding/neteq/unmute_signal.c \ - third_party/webrtc/modules/audio_coding/neteq/webrtc_neteq.c - - -# Flags passed to both C and C++ files. -MY_CFLAGS_Debug := \ - -fstack-protector \ - --param=ssp-buffer-size=4 \ - -Werror \ - -fno-exceptions \ - -fno-strict-aliasing \ - -Wall \ - -Wno-unused-parameter \ - -Wno-missing-field-initializers \ - -fvisibility=hidden \ - -pipe \ - -fPIC \ - -fno-builtin-cos \ - -fno-builtin-sin \ - -fno-builtin-cosf \ - -fno-builtin-sinf \ - -fno-builtin-cos \ - -fno-builtin-sin \ - -fno-builtin-cosf \ - -fno-builtin-sinf \ - -fno-tree-sra \ - -fuse-ld=gold \ - -Wno-psabi \ - -ffunction-sections \ - -funwind-tables \ - -g \ - -fstack-protector \ - -fno-short-enums \ - -finline-limit=64 \ - -Wa,--noexecstack \ - -U_FORTIFY_SOURCE \ - -Wno-extra \ - -Wno-ignored-qualifiers \ - -Wno-type-limits \ - -Wno-unused-but-set-variable \ - -Os \ - -g \ - -fomit-frame-pointer \ - -fdata-sections \ - -ffunction-sections \ - -funwind-tables - -MY_DEFS_Debug := \ - '-DV8_DEPRECATION_WARNINGS' \ - '-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \ - '-D_FILE_OFFSET_BITS=64' \ - '-DNO_TCMALLOC' \ - '-DDISABLE_NACL' \ - '-DCHROMIUM_BUILD' \ - '-DUSE_LIBJPEG_TURBO=1' \ - '-DENABLE_WEBRTC=1' \ - '-DUSE_PROPRIETARY_CODECS' \ - '-DENABLE_CONFIGURATION_POLICY' \ - '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ - '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ - '-DENABLE_EGLIMAGE=1' \ - '-DCLD_VERSION=1' \ - '-DENABLE_PRINTING=1' \ - '-DENABLE_MANAGED_USERS=1' \ - '-DWEBRTC_RESTRICT_LOGGING' \ - '-DWEBRTC_MODULE_UTILITY_VIDEO' \ - '-DWEBRTC_CHROMIUM_BUILD' \ - '-DWEBRTC_ARCH_ARM' \ - '-DWEBRTC_ARCH_ARM_V7' \ - '-DWEBRTC_DETECT_ARM_NEON' \ - '-DWEBRTC_POSIX' \ - '-DWEBRTC_LINUX' \ - '-DWEBRTC_ANDROID' \ - '-DWEBRTC_ANDROID_OPENSLES' \ - '-DNETEQ_VOICEENGINE_CODECS' \ - '-DSCRATCH' \ - '-DUSE_OPENSSL=1' \ - '-DUSE_OPENSSL_CERTS=1' \ - '-D__STDC_CONSTANT_MACROS' \ - '-D__STDC_FORMAT_MACROS' \ - '-DANDROID' \ - '-D__GNU_SOURCE=1' \ - '-DUSE_STLPORT=1' \ - '-D_STLP_USE_PTR_SPECIALIZATIONS=1' \ - '-DCHROME_BUILD_ID=""' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=1' \ - '-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \ - '-D_DEBUG' - - -# Include paths placed before CFLAGS/CPPFLAGS -LOCAL_C_INCLUDES_Debug := \ - $(LOCAL_PATH)/third_party \ - $(LOCAL_PATH) \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/neteq/interface \ - $(LOCAL_PATH)/third_party/webrtc \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/cng/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport - - -# Flags passed to only C++ (and not C) files. -LOCAL_CPPFLAGS_Debug := \ - -fno-rtti \ - -fno-threadsafe-statics \ - -fvisibility-inlines-hidden \ - -Wsign-compare \ - -Wno-abi \ - -Wno-non-virtual-dtor \ - -Wno-sign-promo - - -# Flags passed to both C and C++ files. -MY_CFLAGS_Release := \ - -fstack-protector \ - --param=ssp-buffer-size=4 \ - -Werror \ - -fno-exceptions \ - -fno-strict-aliasing \ - -Wall \ - -Wno-unused-parameter \ - -Wno-missing-field-initializers \ - -fvisibility=hidden \ - -pipe \ - -fPIC \ - -fno-builtin-cos \ - -fno-builtin-sin \ - -fno-builtin-cosf \ - -fno-builtin-sinf \ - -fno-builtin-cos \ - -fno-builtin-sin \ - -fno-builtin-cosf \ - -fno-builtin-sinf \ - -fno-tree-sra \ - -fuse-ld=gold \ - -Wno-psabi \ - -ffunction-sections \ - -funwind-tables \ - -g \ - -fstack-protector \ - -fno-short-enums \ - -finline-limit=64 \ - -Wa,--noexecstack \ - -U_FORTIFY_SOURCE \ - -Wno-extra \ - -Wno-ignored-qualifiers \ - -Wno-type-limits \ - -Wno-unused-but-set-variable \ - -Os \ - -fno-ident \ - -fdata-sections \ - -ffunction-sections \ - -fomit-frame-pointer \ - -funwind-tables - -MY_DEFS_Release := \ - '-DV8_DEPRECATION_WARNINGS' \ - '-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \ - '-D_FILE_OFFSET_BITS=64' \ - '-DNO_TCMALLOC' \ - '-DDISABLE_NACL' \ - '-DCHROMIUM_BUILD' \ - '-DUSE_LIBJPEG_TURBO=1' \ - '-DENABLE_WEBRTC=1' \ - '-DUSE_PROPRIETARY_CODECS' \ - '-DENABLE_CONFIGURATION_POLICY' \ - '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ - '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ - '-DENABLE_EGLIMAGE=1' \ - '-DCLD_VERSION=1' \ - '-DENABLE_PRINTING=1' \ - '-DENABLE_MANAGED_USERS=1' \ - '-DWEBRTC_RESTRICT_LOGGING' \ - '-DWEBRTC_MODULE_UTILITY_VIDEO' \ - '-DWEBRTC_CHROMIUM_BUILD' \ - '-DWEBRTC_ARCH_ARM' \ - '-DWEBRTC_ARCH_ARM_V7' \ - '-DWEBRTC_DETECT_ARM_NEON' \ - '-DWEBRTC_POSIX' \ - '-DWEBRTC_LINUX' \ - '-DWEBRTC_ANDROID' \ - '-DWEBRTC_ANDROID_OPENSLES' \ - '-DNETEQ_VOICEENGINE_CODECS' \ - '-DSCRATCH' \ - '-DUSE_OPENSSL=1' \ - '-DUSE_OPENSSL_CERTS=1' \ - '-D__STDC_CONSTANT_MACROS' \ - '-D__STDC_FORMAT_MACROS' \ - '-DANDROID' \ - '-D__GNU_SOURCE=1' \ - '-DUSE_STLPORT=1' \ - '-D_STLP_USE_PTR_SPECIALIZATIONS=1' \ - '-DCHROME_BUILD_ID=""' \ - '-DNDEBUG' \ - '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-D_FORTIFY_SOURCE=2' - - -# Include paths placed before CFLAGS/CPPFLAGS -LOCAL_C_INCLUDES_Release := \ - $(LOCAL_PATH)/third_party \ - $(LOCAL_PATH) \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/neteq/interface \ - $(LOCAL_PATH)/third_party/webrtc \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/cng/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport - - -# Flags passed to only C++ (and not C) files. -LOCAL_CPPFLAGS_Release := \ - -fno-rtti \ - -fno-threadsafe-statics \ - -fvisibility-inlines-hidden \ - -Wsign-compare \ - -Wno-abi \ - -Wno-non-virtual-dtor \ - -Wno-sign-promo - - -LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) -LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) -LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) -LOCAL_ASFLAGS := $(LOCAL_CFLAGS) -### Rules for final target. - -LOCAL_LDFLAGS_Debug := \ - -Wl,-z,now \ - -Wl,-z,relro \ - -Wl,--fatal-warnings \ - -Wl,-z,noexecstack \ - -fPIC \ - -Wl,-z,relro \ - -Wl,-z,now \ - -fuse-ld=gold \ - -nostdlib \ - -Wl,--no-undefined \ - -Wl,--exclude-libs=ALL \ - -Wl,--icf=safe \ - -Wl,--warn-shared-textrel \ - -Wl,-O1 \ - -Wl,--as-needed - - -LOCAL_LDFLAGS_Release := \ - -Wl,-z,now \ - -Wl,-z,relro \ - -Wl,--fatal-warnings \ - -Wl,-z,noexecstack \ - -fPIC \ - -Wl,-z,relro \ - -Wl,-z,now \ - -fuse-ld=gold \ - -nostdlib \ - -Wl,--no-undefined \ - -Wl,--exclude-libs=ALL \ - -Wl,--icf=safe \ - -Wl,-O1 \ - -Wl,--as-needed \ - -Wl,--gc-sections \ - -Wl,--warn-shared-textrel - - -LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION)) - -LOCAL_STATIC_LIBRARIES := - -# Enable grouping to fix circular references -LOCAL_GROUP_STATIC_LIBRARIES := true - -LOCAL_SHARED_LIBRARIES := \ - libstlport \ - libdl - -# Add target alias to "gyp_all_modules" target. -.PHONY: gyp_all_modules -gyp_all_modules: third_party_webrtc_modules_NetEq_gyp - -# Alias gyp target name. -.PHONY: NetEq -NetEq: third_party_webrtc_modules_NetEq_gyp - -include $(BUILD_STATIC_LIBRARY) diff --git a/modules/NetEq.target.darwin-arm64.mk b/modules/NetEq.target.darwin-arm64.mk deleted file mode 100644 index 7bbf5e00..00000000 --- a/modules/NetEq.target.darwin-arm64.mk +++ /dev/null @@ -1,324 +0,0 @@ -# This file is generated by gyp; do not edit. - -include $(CLEAR_VARS) - -LOCAL_MODULE_CLASS := STATIC_LIBRARIES -LOCAL_MODULE := third_party_webrtc_modules_NetEq_gyp -LOCAL_MODULE_SUFFIX := .a -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) -gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) -gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) - -# Make sure our deps are built first. -GYP_TARGET_DEPENDENCIES := - -GYP_GENERATED_OUTPUTS := - -# Make sure our deps and generated files are built first. -LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS) - -LOCAL_GENERATED_SOURCES := - -GYP_COPIED_SOURCE_ORIGIN_DIRS := - -LOCAL_SRC_FILES := \ - third_party/webrtc/modules/audio_coding/neteq/accelerate.c \ - third_party/webrtc/modules/audio_coding/neteq/automode.c \ - third_party/webrtc/modules/audio_coding/neteq/bgn_update.c \ - third_party/webrtc/modules/audio_coding/neteq/bufstats_decision.c \ - third_party/webrtc/modules/audio_coding/neteq/cng_internal.c \ - third_party/webrtc/modules/audio_coding/neteq/codec_db.c \ - third_party/webrtc/modules/audio_coding/neteq/correlator.c \ - third_party/webrtc/modules/audio_coding/neteq/dsp.c \ - third_party/webrtc/modules/audio_coding/neteq/dsp_helpfunctions.c \ - third_party/webrtc/modules/audio_coding/neteq/dtmf_buffer.c \ - third_party/webrtc/modules/audio_coding/neteq/dtmf_tonegen.c \ - third_party/webrtc/modules/audio_coding/neteq/expand.c \ - third_party/webrtc/modules/audio_coding/neteq/mcu_address_init.c \ - third_party/webrtc/modules/audio_coding/neteq/mcu_dsp_common.c \ - third_party/webrtc/modules/audio_coding/neteq/mcu_reset.c \ - third_party/webrtc/modules/audio_coding/neteq/merge.c \ - third_party/webrtc/modules/audio_coding/neteq/min_distortion.c \ - third_party/webrtc/modules/audio_coding/neteq/mix_voice_unvoice.c \ - third_party/webrtc/modules/audio_coding/neteq/mute_signal.c \ - third_party/webrtc/modules/audio_coding/neteq/normal.c \ - third_party/webrtc/modules/audio_coding/neteq/packet_buffer.c \ - third_party/webrtc/modules/audio_coding/neteq/peak_detection.c \ - third_party/webrtc/modules/audio_coding/neteq/preemptive_expand.c \ - third_party/webrtc/modules/audio_coding/neteq/random_vector.c \ - third_party/webrtc/modules/audio_coding/neteq/recin.c \ - third_party/webrtc/modules/audio_coding/neteq/recout.c \ - third_party/webrtc/modules/audio_coding/neteq/rtcp.c \ - third_party/webrtc/modules/audio_coding/neteq/rtp.c \ - third_party/webrtc/modules/audio_coding/neteq/set_fs.c \ - third_party/webrtc/modules/audio_coding/neteq/signal_mcu.c \ - third_party/webrtc/modules/audio_coding/neteq/split_and_insert.c \ - third_party/webrtc/modules/audio_coding/neteq/unmute_signal.c \ - third_party/webrtc/modules/audio_coding/neteq/webrtc_neteq.c - - -# Flags passed to both C and C++ files. -MY_CFLAGS_Debug := \ - --param=ssp-buffer-size=4 \ - -Werror \ - -fno-exceptions \ - -fno-strict-aliasing \ - -Wall \ - -Wno-unused-parameter \ - -Wno-missing-field-initializers \ - -fvisibility=hidden \ - -pipe \ - -fPIC \ - -Wno-unused-local-typedefs \ - -fno-builtin-cos \ - -fno-builtin-sin \ - -fno-builtin-cosf \ - -fno-builtin-sinf \ - -fno-builtin-cos \ - -fno-builtin-sin \ - -fno-builtin-cosf \ - -fno-builtin-sinf \ - -ffunction-sections \ - -funwind-tables \ - -g \ - -fno-short-enums \ - -finline-limit=64 \ - -Wa,--noexecstack \ - -U_FORTIFY_SOURCE \ - -Wno-extra \ - -Wno-ignored-qualifiers \ - -Wno-type-limits \ - -Wno-unused-but-set-variable \ - -Os \ - -g \ - -fomit-frame-pointer \ - -fdata-sections \ - -ffunction-sections \ - -funwind-tables - -MY_DEFS_Debug := \ - '-DV8_DEPRECATION_WARNINGS' \ - '-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \ - '-D_FILE_OFFSET_BITS=64' \ - '-DNO_TCMALLOC' \ - '-DDISABLE_NACL' \ - '-DCHROMIUM_BUILD' \ - '-DUSE_LIBJPEG_TURBO=1' \ - '-DENABLE_WEBRTC=1' \ - '-DUSE_PROPRIETARY_CODECS' \ - '-DENABLE_CONFIGURATION_POLICY' \ - '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ - '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ - '-DENABLE_EGLIMAGE=1' \ - '-DCLD_VERSION=1' \ - '-DENABLE_PRINTING=1' \ - '-DENABLE_MANAGED_USERS=1' \ - '-DWEBRTC_RESTRICT_LOGGING' \ - '-DWEBRTC_MODULE_UTILITY_VIDEO' \ - '-DWEBRTC_CHROMIUM_BUILD' \ - '-DWEBRTC_POSIX' \ - '-DWEBRTC_LINUX' \ - '-DWEBRTC_ANDROID' \ - '-DWEBRTC_ANDROID_OPENSLES' \ - '-DNETEQ_VOICEENGINE_CODECS' \ - '-DSCRATCH' \ - '-DUSE_OPENSSL=1' \ - '-DUSE_OPENSSL_CERTS=1' \ - '-D__STDC_CONSTANT_MACROS' \ - '-D__STDC_FORMAT_MACROS' \ - '-DANDROID' \ - '-D__GNU_SOURCE=1' \ - '-DUSE_STLPORT=1' \ - '-D_STLP_USE_PTR_SPECIALIZATIONS=1' \ - '-DCHROME_BUILD_ID=""' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=1' \ - '-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \ - '-D_DEBUG' - - -# Include paths placed before CFLAGS/CPPFLAGS -LOCAL_C_INCLUDES_Debug := \ - $(LOCAL_PATH)/third_party \ - $(LOCAL_PATH) \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/neteq/interface \ - $(LOCAL_PATH)/third_party/webrtc \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/cng/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport - - -# Flags passed to only C++ (and not C) files. -LOCAL_CPPFLAGS_Debug := \ - -fno-rtti \ - -fno-threadsafe-statics \ - -fvisibility-inlines-hidden \ - -Wsign-compare \ - -Wno-non-virtual-dtor \ - -Wno-sign-promo - - -# Flags passed to both C and C++ files. -MY_CFLAGS_Release := \ - --param=ssp-buffer-size=4 \ - -Werror \ - -fno-exceptions \ - -fno-strict-aliasing \ - -Wall \ - -Wno-unused-parameter \ - -Wno-missing-field-initializers \ - -fvisibility=hidden \ - -pipe \ - -fPIC \ - -Wno-unused-local-typedefs \ - -fno-builtin-cos \ - -fno-builtin-sin \ - -fno-builtin-cosf \ - -fno-builtin-sinf \ - -fno-builtin-cos \ - -fno-builtin-sin \ - -fno-builtin-cosf \ - -fno-builtin-sinf \ - -ffunction-sections \ - -funwind-tables \ - -g \ - -fno-short-enums \ - -finline-limit=64 \ - -Wa,--noexecstack \ - -U_FORTIFY_SOURCE \ - -Wno-extra \ - -Wno-ignored-qualifiers \ - -Wno-type-limits \ - -Wno-unused-but-set-variable \ - -Os \ - -fno-ident \ - -fdata-sections \ - -ffunction-sections \ - -fomit-frame-pointer \ - -funwind-tables - -MY_DEFS_Release := \ - '-DV8_DEPRECATION_WARNINGS' \ - '-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \ - '-D_FILE_OFFSET_BITS=64' \ - '-DNO_TCMALLOC' \ - '-DDISABLE_NACL' \ - '-DCHROMIUM_BUILD' \ - '-DUSE_LIBJPEG_TURBO=1' \ - '-DENABLE_WEBRTC=1' \ - '-DUSE_PROPRIETARY_CODECS' \ - '-DENABLE_CONFIGURATION_POLICY' \ - '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ - '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ - '-DENABLE_EGLIMAGE=1' \ - '-DCLD_VERSION=1' \ - '-DENABLE_PRINTING=1' \ - '-DENABLE_MANAGED_USERS=1' \ - '-DWEBRTC_RESTRICT_LOGGING' \ - '-DWEBRTC_MODULE_UTILITY_VIDEO' \ - '-DWEBRTC_CHROMIUM_BUILD' \ - '-DWEBRTC_POSIX' \ - '-DWEBRTC_LINUX' \ - '-DWEBRTC_ANDROID' \ - '-DWEBRTC_ANDROID_OPENSLES' \ - '-DNETEQ_VOICEENGINE_CODECS' \ - '-DSCRATCH' \ - '-DUSE_OPENSSL=1' \ - '-DUSE_OPENSSL_CERTS=1' \ - '-D__STDC_CONSTANT_MACROS' \ - '-D__STDC_FORMAT_MACROS' \ - '-DANDROID' \ - '-D__GNU_SOURCE=1' \ - '-DUSE_STLPORT=1' \ - '-D_STLP_USE_PTR_SPECIALIZATIONS=1' \ - '-DCHROME_BUILD_ID=""' \ - '-DNDEBUG' \ - '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-D_FORTIFY_SOURCE=2' - - -# Include paths placed before CFLAGS/CPPFLAGS -LOCAL_C_INCLUDES_Release := \ - $(LOCAL_PATH)/third_party \ - $(LOCAL_PATH) \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/neteq/interface \ - $(LOCAL_PATH)/third_party/webrtc \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/cng/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport - - -# Flags passed to only C++ (and not C) files. -LOCAL_CPPFLAGS_Release := \ - -fno-rtti \ - -fno-threadsafe-statics \ - -fvisibility-inlines-hidden \ - -Wsign-compare \ - -Wno-non-virtual-dtor \ - -Wno-sign-promo - - -LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) -LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) -LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) -LOCAL_ASFLAGS := $(LOCAL_CFLAGS) -### Rules for final target. - -LOCAL_LDFLAGS_Debug := \ - -Wl,-z,now \ - -Wl,-z,relro \ - -Wl,--fatal-warnings \ - -Wl,-z,noexecstack \ - -fPIC \ - -nostdlib \ - -Wl,--no-undefined \ - -Wl,--exclude-libs=ALL \ - -Wl,--warn-shared-textrel \ - -Wl,-O1 \ - -Wl,--as-needed - - -LOCAL_LDFLAGS_Release := \ - -Wl,-z,now \ - -Wl,-z,relro \ - -Wl,--fatal-warnings \ - -Wl,-z,noexecstack \ - -fPIC \ - -nostdlib \ - -Wl,--no-undefined \ - -Wl,--exclude-libs=ALL \ - -Wl,-O1 \ - -Wl,--as-needed \ - -Wl,--gc-sections \ - -Wl,--warn-shared-textrel - - -LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION)) - -LOCAL_STATIC_LIBRARIES := - -# Enable grouping to fix circular references -LOCAL_GROUP_STATIC_LIBRARIES := true - -LOCAL_SHARED_LIBRARIES := \ - libstlport \ - libdl - -# Add target alias to "gyp_all_modules" target. -.PHONY: gyp_all_modules -gyp_all_modules: third_party_webrtc_modules_NetEq_gyp - -# Alias gyp target name. -.PHONY: NetEq -NetEq: third_party_webrtc_modules_NetEq_gyp - -include $(BUILD_STATIC_LIBRARY) diff --git a/modules/NetEq.target.darwin-mips.mk b/modules/NetEq.target.darwin-mips.mk deleted file mode 100644 index 240cc6c1..00000000 --- a/modules/NetEq.target.darwin-mips.mk +++ /dev/null @@ -1,344 +0,0 @@ -# This file is generated by gyp; do not edit. - -include $(CLEAR_VARS) - -LOCAL_MODULE_CLASS := STATIC_LIBRARIES -LOCAL_MODULE := third_party_webrtc_modules_NetEq_gyp -LOCAL_MODULE_SUFFIX := .a -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) -gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) -gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) - -# Make sure our deps are built first. -GYP_TARGET_DEPENDENCIES := - -GYP_GENERATED_OUTPUTS := - -# Make sure our deps and generated files are built first. -LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS) - -LOCAL_GENERATED_SOURCES := - -GYP_COPIED_SOURCE_ORIGIN_DIRS := - -LOCAL_SRC_FILES := \ - third_party/webrtc/modules/audio_coding/neteq/accelerate.c \ - third_party/webrtc/modules/audio_coding/neteq/automode.c \ - third_party/webrtc/modules/audio_coding/neteq/bgn_update.c \ - third_party/webrtc/modules/audio_coding/neteq/bufstats_decision.c \ - third_party/webrtc/modules/audio_coding/neteq/cng_internal.c \ - third_party/webrtc/modules/audio_coding/neteq/codec_db.c \ - third_party/webrtc/modules/audio_coding/neteq/correlator.c \ - third_party/webrtc/modules/audio_coding/neteq/dsp.c \ - third_party/webrtc/modules/audio_coding/neteq/dsp_helpfunctions.c \ - third_party/webrtc/modules/audio_coding/neteq/dtmf_buffer.c \ - third_party/webrtc/modules/audio_coding/neteq/dtmf_tonegen.c \ - third_party/webrtc/modules/audio_coding/neteq/expand.c \ - third_party/webrtc/modules/audio_coding/neteq/mcu_address_init.c \ - third_party/webrtc/modules/audio_coding/neteq/mcu_dsp_common.c \ - third_party/webrtc/modules/audio_coding/neteq/mcu_reset.c \ - third_party/webrtc/modules/audio_coding/neteq/merge.c \ - third_party/webrtc/modules/audio_coding/neteq/min_distortion.c \ - third_party/webrtc/modules/audio_coding/neteq/mix_voice_unvoice.c \ - third_party/webrtc/modules/audio_coding/neteq/mute_signal.c \ - third_party/webrtc/modules/audio_coding/neteq/normal.c \ - third_party/webrtc/modules/audio_coding/neteq/packet_buffer.c \ - third_party/webrtc/modules/audio_coding/neteq/peak_detection.c \ - third_party/webrtc/modules/audio_coding/neteq/preemptive_expand.c \ - third_party/webrtc/modules/audio_coding/neteq/random_vector.c \ - third_party/webrtc/modules/audio_coding/neteq/recin.c \ - third_party/webrtc/modules/audio_coding/neteq/recout.c \ - third_party/webrtc/modules/audio_coding/neteq/rtcp.c \ - third_party/webrtc/modules/audio_coding/neteq/rtp.c \ - third_party/webrtc/modules/audio_coding/neteq/set_fs.c \ - third_party/webrtc/modules/audio_coding/neteq/signal_mcu.c \ - third_party/webrtc/modules/audio_coding/neteq/split_and_insert.c \ - third_party/webrtc/modules/audio_coding/neteq/unmute_signal.c \ - third_party/webrtc/modules/audio_coding/neteq/webrtc_neteq.c - - -# Flags passed to both C and C++ files. -MY_CFLAGS_Debug := \ - -fstack-protector \ - --param=ssp-buffer-size=4 \ - \ - -fno-exceptions \ - -fno-strict-aliasing \ - -Wall \ - -Wno-unused-parameter \ - -Wno-missing-field-initializers \ - -fvisibility=hidden \ - -pipe \ - -fPIC \ - -mhard-float \ - -fno-builtin-cos \ - -fno-builtin-sin \ - -fno-builtin-cosf \ - -fno-builtin-sinf \ - -mhard-float \ - -fno-builtin-cos \ - -fno-builtin-sin \ - -fno-builtin-cosf \ - -fno-builtin-sinf \ - -EL \ - -mhard-float \ - -ffunction-sections \ - -funwind-tables \ - -g \ - -fstack-protector \ - -fno-short-enums \ - -finline-limit=64 \ - -Wa,--noexecstack \ - -U_FORTIFY_SOURCE \ - -Wno-extra \ - -Wno-ignored-qualifiers \ - -Wno-type-limits \ - -Wno-unused-but-set-variable \ - -Os \ - -g \ - -fomit-frame-pointer \ - -fdata-sections \ - -ffunction-sections \ - -funwind-tables - -MY_DEFS_Debug := \ - '-DV8_DEPRECATION_WARNINGS' \ - '-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \ - '-D_FILE_OFFSET_BITS=64' \ - '-DNO_TCMALLOC' \ - '-DDISABLE_NACL' \ - '-DCHROMIUM_BUILD' \ - '-DUSE_LIBJPEG_TURBO=1' \ - '-DENABLE_WEBRTC=1' \ - '-DUSE_PROPRIETARY_CODECS' \ - '-DENABLE_CONFIGURATION_POLICY' \ - '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ - '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ - '-DENABLE_EGLIMAGE=1' \ - '-DCLD_VERSION=1' \ - '-DENABLE_PRINTING=1' \ - '-DENABLE_MANAGED_USERS=1' \ - '-DWEBRTC_RESTRICT_LOGGING' \ - '-DWEBRTC_MODULE_UTILITY_VIDEO' \ - '-DWEBRTC_CHROMIUM_BUILD' \ - '-DMIPS32_LE' \ - '-DMIPS_FPU_LE' \ - '-DWEBRTC_POSIX' \ - '-DWEBRTC_LINUX' \ - '-DWEBRTC_ANDROID' \ - '-DWEBRTC_ANDROID_OPENSLES' \ - '-DNETEQ_VOICEENGINE_CODECS' \ - '-DSCRATCH' \ - '-DUSE_OPENSSL=1' \ - '-DUSE_OPENSSL_CERTS=1' \ - '-D__STDC_CONSTANT_MACROS' \ - '-D__STDC_FORMAT_MACROS' \ - '-DANDROID' \ - '-D__GNU_SOURCE=1' \ - '-DUSE_STLPORT=1' \ - '-D_STLP_USE_PTR_SPECIALIZATIONS=1' \ - '-DCHROME_BUILD_ID=""' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=1' \ - '-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \ - '-D_DEBUG' - - -# Include paths placed before CFLAGS/CPPFLAGS -LOCAL_C_INCLUDES_Debug := \ - $(LOCAL_PATH)/third_party \ - $(LOCAL_PATH) \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/neteq/interface \ - $(LOCAL_PATH)/third_party/webrtc \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/cng/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport - - -# Flags passed to only C++ (and not C) files. -LOCAL_CPPFLAGS_Debug := \ - -fno-rtti \ - -fno-threadsafe-statics \ - -fvisibility-inlines-hidden \ - -Wsign-compare \ - -Wno-uninitialized \ - -Wno-non-virtual-dtor \ - -Wno-sign-promo - - -# Flags passed to both C and C++ files. -MY_CFLAGS_Release := \ - -fstack-protector \ - --param=ssp-buffer-size=4 \ - \ - -fno-exceptions \ - -fno-strict-aliasing \ - -Wall \ - -Wno-unused-parameter \ - -Wno-missing-field-initializers \ - -fvisibility=hidden \ - -pipe \ - -fPIC \ - -mhard-float \ - -fno-builtin-cos \ - -fno-builtin-sin \ - -fno-builtin-cosf \ - -fno-builtin-sinf \ - -mhard-float \ - -fno-builtin-cos \ - -fno-builtin-sin \ - -fno-builtin-cosf \ - -fno-builtin-sinf \ - -EL \ - -mhard-float \ - -ffunction-sections \ - -funwind-tables \ - -g \ - -fstack-protector \ - -fno-short-enums \ - -finline-limit=64 \ - -Wa,--noexecstack \ - -U_FORTIFY_SOURCE \ - -Wno-extra \ - -Wno-ignored-qualifiers \ - -Wno-type-limits \ - -Wno-unused-but-set-variable \ - -Os \ - -fno-ident \ - -fdata-sections \ - -ffunction-sections \ - -fomit-frame-pointer \ - -funwind-tables - -MY_DEFS_Release := \ - '-DV8_DEPRECATION_WARNINGS' \ - '-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \ - '-D_FILE_OFFSET_BITS=64' \ - '-DNO_TCMALLOC' \ - '-DDISABLE_NACL' \ - '-DCHROMIUM_BUILD' \ - '-DUSE_LIBJPEG_TURBO=1' \ - '-DENABLE_WEBRTC=1' \ - '-DUSE_PROPRIETARY_CODECS' \ - '-DENABLE_CONFIGURATION_POLICY' \ - '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ - '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ - '-DENABLE_EGLIMAGE=1' \ - '-DCLD_VERSION=1' \ - '-DENABLE_PRINTING=1' \ - '-DENABLE_MANAGED_USERS=1' \ - '-DWEBRTC_RESTRICT_LOGGING' \ - '-DWEBRTC_MODULE_UTILITY_VIDEO' \ - '-DWEBRTC_CHROMIUM_BUILD' \ - '-DMIPS32_LE' \ - '-DMIPS_FPU_LE' \ - '-DWEBRTC_POSIX' \ - '-DWEBRTC_LINUX' \ - '-DWEBRTC_ANDROID' \ - '-DWEBRTC_ANDROID_OPENSLES' \ - '-DNETEQ_VOICEENGINE_CODECS' \ - '-DSCRATCH' \ - '-DUSE_OPENSSL=1' \ - '-DUSE_OPENSSL_CERTS=1' \ - '-D__STDC_CONSTANT_MACROS' \ - '-D__STDC_FORMAT_MACROS' \ - '-DANDROID' \ - '-D__GNU_SOURCE=1' \ - '-DUSE_STLPORT=1' \ - '-D_STLP_USE_PTR_SPECIALIZATIONS=1' \ - '-DCHROME_BUILD_ID=""' \ - '-DNDEBUG' \ - '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-D_FORTIFY_SOURCE=2' - - -# Include paths placed before CFLAGS/CPPFLAGS -LOCAL_C_INCLUDES_Release := \ - $(LOCAL_PATH)/third_party \ - $(LOCAL_PATH) \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/neteq/interface \ - $(LOCAL_PATH)/third_party/webrtc \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/cng/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport - - -# Flags passed to only C++ (and not C) files. -LOCAL_CPPFLAGS_Release := \ - -fno-rtti \ - -fno-threadsafe-statics \ - -fvisibility-inlines-hidden \ - -Wsign-compare \ - -Wno-uninitialized \ - -Wno-non-virtual-dtor \ - -Wno-sign-promo - - -LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) -LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) -LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) -LOCAL_ASFLAGS := $(LOCAL_CFLAGS) -### Rules for final target. - -LOCAL_LDFLAGS_Debug := \ - -Wl,-z,now \ - -Wl,-z,relro \ - -Wl,--fatal-warnings \ - -Wl,-z,noexecstack \ - -fPIC \ - -EL \ - -Wl,--no-keep-memory \ - -nostdlib \ - -Wl,--no-undefined \ - -Wl,--exclude-libs=ALL \ - -Wl,--warn-shared-textrel \ - -Wl,-O1 \ - -Wl,--as-needed - - -LOCAL_LDFLAGS_Release := \ - -Wl,-z,now \ - -Wl,-z,relro \ - -Wl,--fatal-warnings \ - -Wl,-z,noexecstack \ - -fPIC \ - -EL \ - -Wl,--no-keep-memory \ - -nostdlib \ - -Wl,--no-undefined \ - -Wl,--exclude-libs=ALL \ - -Wl,-O1 \ - -Wl,--as-needed \ - -Wl,--gc-sections \ - -Wl,--warn-shared-textrel - - -LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION)) - -LOCAL_STATIC_LIBRARIES := - -# Enable grouping to fix circular references -LOCAL_GROUP_STATIC_LIBRARIES := true - -LOCAL_SHARED_LIBRARIES := \ - libstlport \ - libdl - -# Add target alias to "gyp_all_modules" target. -.PHONY: gyp_all_modules -gyp_all_modules: third_party_webrtc_modules_NetEq_gyp - -# Alias gyp target name. -.PHONY: NetEq -NetEq: third_party_webrtc_modules_NetEq_gyp - -include $(BUILD_STATIC_LIBRARY) diff --git a/modules/NetEq.target.darwin-x86.mk b/modules/NetEq.target.darwin-x86.mk deleted file mode 100644 index 3b05cd95..00000000 --- a/modules/NetEq.target.darwin-x86.mk +++ /dev/null @@ -1,338 +0,0 @@ -# This file is generated by gyp; do not edit. - -include $(CLEAR_VARS) - -LOCAL_MODULE_CLASS := STATIC_LIBRARIES -LOCAL_MODULE := third_party_webrtc_modules_NetEq_gyp -LOCAL_MODULE_SUFFIX := .a -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) -gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) -gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) - -# Make sure our deps are built first. -GYP_TARGET_DEPENDENCIES := - -GYP_GENERATED_OUTPUTS := - -# Make sure our deps and generated files are built first. -LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS) - -LOCAL_GENERATED_SOURCES := - -GYP_COPIED_SOURCE_ORIGIN_DIRS := - -LOCAL_SRC_FILES := \ - third_party/webrtc/modules/audio_coding/neteq/accelerate.c \ - third_party/webrtc/modules/audio_coding/neteq/automode.c \ - third_party/webrtc/modules/audio_coding/neteq/bgn_update.c \ - third_party/webrtc/modules/audio_coding/neteq/bufstats_decision.c \ - third_party/webrtc/modules/audio_coding/neteq/cng_internal.c \ - third_party/webrtc/modules/audio_coding/neteq/codec_db.c \ - third_party/webrtc/modules/audio_coding/neteq/correlator.c \ - third_party/webrtc/modules/audio_coding/neteq/dsp.c \ - third_party/webrtc/modules/audio_coding/neteq/dsp_helpfunctions.c \ - third_party/webrtc/modules/audio_coding/neteq/dtmf_buffer.c \ - third_party/webrtc/modules/audio_coding/neteq/dtmf_tonegen.c \ - third_party/webrtc/modules/audio_coding/neteq/expand.c \ - third_party/webrtc/modules/audio_coding/neteq/mcu_address_init.c \ - third_party/webrtc/modules/audio_coding/neteq/mcu_dsp_common.c \ - third_party/webrtc/modules/audio_coding/neteq/mcu_reset.c \ - third_party/webrtc/modules/audio_coding/neteq/merge.c \ - third_party/webrtc/modules/audio_coding/neteq/min_distortion.c \ - third_party/webrtc/modules/audio_coding/neteq/mix_voice_unvoice.c \ - third_party/webrtc/modules/audio_coding/neteq/mute_signal.c \ - third_party/webrtc/modules/audio_coding/neteq/normal.c \ - third_party/webrtc/modules/audio_coding/neteq/packet_buffer.c \ - third_party/webrtc/modules/audio_coding/neteq/peak_detection.c \ - third_party/webrtc/modules/audio_coding/neteq/preemptive_expand.c \ - third_party/webrtc/modules/audio_coding/neteq/random_vector.c \ - third_party/webrtc/modules/audio_coding/neteq/recin.c \ - third_party/webrtc/modules/audio_coding/neteq/recout.c \ - third_party/webrtc/modules/audio_coding/neteq/rtcp.c \ - third_party/webrtc/modules/audio_coding/neteq/rtp.c \ - third_party/webrtc/modules/audio_coding/neteq/set_fs.c \ - third_party/webrtc/modules/audio_coding/neteq/signal_mcu.c \ - third_party/webrtc/modules/audio_coding/neteq/split_and_insert.c \ - third_party/webrtc/modules/audio_coding/neteq/unmute_signal.c \ - third_party/webrtc/modules/audio_coding/neteq/webrtc_neteq.c - - -# Flags passed to both C and C++ files. -MY_CFLAGS_Debug := \ - --param=ssp-buffer-size=4 \ - -Werror \ - -fno-exceptions \ - -fno-strict-aliasing \ - -Wall \ - -Wno-unused-parameter \ - -Wno-missing-field-initializers \ - -fvisibility=hidden \ - -pipe \ - -fPIC \ - -fno-builtin-cos \ - -fno-builtin-sin \ - -fno-builtin-cosf \ - -fno-builtin-sinf \ - -fno-builtin-cos \ - -fno-builtin-sin \ - -fno-builtin-cosf \ - -fno-builtin-sinf \ - -msse2 \ - -mfpmath=sse \ - -mmmx \ - -m32 \ - -fuse-ld=gold \ - -ffunction-sections \ - -funwind-tables \ - -g \ - -fno-short-enums \ - -finline-limit=64 \ - -Wa,--noexecstack \ - -U_FORTIFY_SOURCE \ - -Wno-extra \ - -Wno-ignored-qualifiers \ - -Wno-type-limits \ - -Wno-unused-but-set-variable \ - -fno-stack-protector \ - -Os \ - -g \ - -fomit-frame-pointer \ - -fdata-sections \ - -ffunction-sections \ - -funwind-tables - -MY_DEFS_Debug := \ - '-DV8_DEPRECATION_WARNINGS' \ - '-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \ - '-D_FILE_OFFSET_BITS=64' \ - '-DNO_TCMALLOC' \ - '-DDISABLE_NACL' \ - '-DCHROMIUM_BUILD' \ - '-DUSE_LIBJPEG_TURBO=1' \ - '-DENABLE_WEBRTC=1' \ - '-DUSE_PROPRIETARY_CODECS' \ - '-DENABLE_CONFIGURATION_POLICY' \ - '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ - '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ - '-DENABLE_EGLIMAGE=1' \ - '-DCLD_VERSION=1' \ - '-DENABLE_PRINTING=1' \ - '-DENABLE_MANAGED_USERS=1' \ - '-DWEBRTC_RESTRICT_LOGGING' \ - '-DWEBRTC_MODULE_UTILITY_VIDEO' \ - '-DWEBRTC_CHROMIUM_BUILD' \ - '-DWEBRTC_POSIX' \ - '-DWEBRTC_LINUX' \ - '-DWEBRTC_ANDROID' \ - '-DWEBRTC_ANDROID_OPENSLES' \ - '-DNETEQ_VOICEENGINE_CODECS' \ - '-DSCRATCH' \ - '-DUSE_OPENSSL=1' \ - '-DUSE_OPENSSL_CERTS=1' \ - '-D__STDC_CONSTANT_MACROS' \ - '-D__STDC_FORMAT_MACROS' \ - '-DANDROID' \ - '-D__GNU_SOURCE=1' \ - '-DUSE_STLPORT=1' \ - '-D_STLP_USE_PTR_SPECIALIZATIONS=1' \ - '-DCHROME_BUILD_ID=""' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=1' \ - '-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \ - '-D_DEBUG' - - -# Include paths placed before CFLAGS/CPPFLAGS -LOCAL_C_INCLUDES_Debug := \ - $(LOCAL_PATH)/third_party \ - $(LOCAL_PATH) \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/neteq/interface \ - $(LOCAL_PATH)/third_party/webrtc \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/cng/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport - - -# Flags passed to only C++ (and not C) files. -LOCAL_CPPFLAGS_Debug := \ - -fno-rtti \ - -fno-threadsafe-statics \ - -fvisibility-inlines-hidden \ - -Wsign-compare \ - -Wno-non-virtual-dtor \ - -Wno-sign-promo - - -# Flags passed to both C and C++ files. -MY_CFLAGS_Release := \ - --param=ssp-buffer-size=4 \ - -Werror \ - -fno-exceptions \ - -fno-strict-aliasing \ - -Wall \ - -Wno-unused-parameter \ - -Wno-missing-field-initializers \ - -fvisibility=hidden \ - -pipe \ - -fPIC \ - -fno-builtin-cos \ - -fno-builtin-sin \ - -fno-builtin-cosf \ - -fno-builtin-sinf \ - -fno-builtin-cos \ - -fno-builtin-sin \ - -fno-builtin-cosf \ - -fno-builtin-sinf \ - -msse2 \ - -mfpmath=sse \ - -mmmx \ - -m32 \ - -fuse-ld=gold \ - -ffunction-sections \ - -funwind-tables \ - -g \ - -fno-short-enums \ - -finline-limit=64 \ - -Wa,--noexecstack \ - -U_FORTIFY_SOURCE \ - -Wno-extra \ - -Wno-ignored-qualifiers \ - -Wno-type-limits \ - -Wno-unused-but-set-variable \ - -fno-stack-protector \ - -Os \ - -fno-ident \ - -fdata-sections \ - -ffunction-sections \ - -fomit-frame-pointer \ - -funwind-tables - -MY_DEFS_Release := \ - '-DV8_DEPRECATION_WARNINGS' \ - '-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \ - '-D_FILE_OFFSET_BITS=64' \ - '-DNO_TCMALLOC' \ - '-DDISABLE_NACL' \ - '-DCHROMIUM_BUILD' \ - '-DUSE_LIBJPEG_TURBO=1' \ - '-DENABLE_WEBRTC=1' \ - '-DUSE_PROPRIETARY_CODECS' \ - '-DENABLE_CONFIGURATION_POLICY' \ - '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ - '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ - '-DENABLE_EGLIMAGE=1' \ - '-DCLD_VERSION=1' \ - '-DENABLE_PRINTING=1' \ - '-DENABLE_MANAGED_USERS=1' \ - '-DWEBRTC_RESTRICT_LOGGING' \ - '-DWEBRTC_MODULE_UTILITY_VIDEO' \ - '-DWEBRTC_CHROMIUM_BUILD' \ - '-DWEBRTC_POSIX' \ - '-DWEBRTC_LINUX' \ - '-DWEBRTC_ANDROID' \ - '-DWEBRTC_ANDROID_OPENSLES' \ - '-DNETEQ_VOICEENGINE_CODECS' \ - '-DSCRATCH' \ - '-DUSE_OPENSSL=1' \ - '-DUSE_OPENSSL_CERTS=1' \ - '-D__STDC_CONSTANT_MACROS' \ - '-D__STDC_FORMAT_MACROS' \ - '-DANDROID' \ - '-D__GNU_SOURCE=1' \ - '-DUSE_STLPORT=1' \ - '-D_STLP_USE_PTR_SPECIALIZATIONS=1' \ - '-DCHROME_BUILD_ID=""' \ - '-DNDEBUG' \ - '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-D_FORTIFY_SOURCE=2' - - -# Include paths placed before CFLAGS/CPPFLAGS -LOCAL_C_INCLUDES_Release := \ - $(LOCAL_PATH)/third_party \ - $(LOCAL_PATH) \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/neteq/interface \ - $(LOCAL_PATH)/third_party/webrtc \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/cng/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport - - -# Flags passed to only C++ (and not C) files. -LOCAL_CPPFLAGS_Release := \ - -fno-rtti \ - -fno-threadsafe-statics \ - -fvisibility-inlines-hidden \ - -Wsign-compare \ - -Wno-non-virtual-dtor \ - -Wno-sign-promo - - -LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) -LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) -LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) -LOCAL_ASFLAGS := $(LOCAL_CFLAGS) -### Rules for final target. - -LOCAL_LDFLAGS_Debug := \ - -Wl,-z,now \ - -Wl,-z,relro \ - -Wl,--fatal-warnings \ - -Wl,-z,noexecstack \ - -fPIC \ - -m32 \ - -fuse-ld=gold \ - -nostdlib \ - -Wl,--no-undefined \ - -Wl,--exclude-libs=ALL \ - -Wl,--warn-shared-textrel \ - -Wl,-O1 \ - -Wl,--as-needed - - -LOCAL_LDFLAGS_Release := \ - -Wl,-z,now \ - -Wl,-z,relro \ - -Wl,--fatal-warnings \ - -Wl,-z,noexecstack \ - -fPIC \ - -m32 \ - -fuse-ld=gold \ - -nostdlib \ - -Wl,--no-undefined \ - -Wl,--exclude-libs=ALL \ - -Wl,-O1 \ - -Wl,--as-needed \ - -Wl,--gc-sections \ - -Wl,--warn-shared-textrel - - -LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION)) - -LOCAL_STATIC_LIBRARIES := - -# Enable grouping to fix circular references -LOCAL_GROUP_STATIC_LIBRARIES := true - -LOCAL_SHARED_LIBRARIES := \ - libstlport \ - libdl - -# Add target alias to "gyp_all_modules" target. -.PHONY: gyp_all_modules -gyp_all_modules: third_party_webrtc_modules_NetEq_gyp - -# Alias gyp target name. -.PHONY: NetEq -NetEq: third_party_webrtc_modules_NetEq_gyp - -include $(BUILD_STATIC_LIBRARY) diff --git a/modules/NetEq.target.darwin-x86_64.mk b/modules/NetEq.target.darwin-x86_64.mk deleted file mode 100644 index c84869c1..00000000 --- a/modules/NetEq.target.darwin-x86_64.mk +++ /dev/null @@ -1,338 +0,0 @@ -# This file is generated by gyp; do not edit. - -include $(CLEAR_VARS) - -LOCAL_MODULE_CLASS := STATIC_LIBRARIES -LOCAL_MODULE := third_party_webrtc_modules_NetEq_gyp -LOCAL_MODULE_SUFFIX := .a -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) -gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) -gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) - -# Make sure our deps are built first. -GYP_TARGET_DEPENDENCIES := - -GYP_GENERATED_OUTPUTS := - -# Make sure our deps and generated files are built first. -LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS) - -LOCAL_GENERATED_SOURCES := - -GYP_COPIED_SOURCE_ORIGIN_DIRS := - -LOCAL_SRC_FILES := \ - third_party/webrtc/modules/audio_coding/neteq/accelerate.c \ - third_party/webrtc/modules/audio_coding/neteq/automode.c \ - third_party/webrtc/modules/audio_coding/neteq/bgn_update.c \ - third_party/webrtc/modules/audio_coding/neteq/bufstats_decision.c \ - third_party/webrtc/modules/audio_coding/neteq/cng_internal.c \ - third_party/webrtc/modules/audio_coding/neteq/codec_db.c \ - third_party/webrtc/modules/audio_coding/neteq/correlator.c \ - third_party/webrtc/modules/audio_coding/neteq/dsp.c \ - third_party/webrtc/modules/audio_coding/neteq/dsp_helpfunctions.c \ - third_party/webrtc/modules/audio_coding/neteq/dtmf_buffer.c \ - third_party/webrtc/modules/audio_coding/neteq/dtmf_tonegen.c \ - third_party/webrtc/modules/audio_coding/neteq/expand.c \ - third_party/webrtc/modules/audio_coding/neteq/mcu_address_init.c \ - third_party/webrtc/modules/audio_coding/neteq/mcu_dsp_common.c \ - third_party/webrtc/modules/audio_coding/neteq/mcu_reset.c \ - third_party/webrtc/modules/audio_coding/neteq/merge.c \ - third_party/webrtc/modules/audio_coding/neteq/min_distortion.c \ - third_party/webrtc/modules/audio_coding/neteq/mix_voice_unvoice.c \ - third_party/webrtc/modules/audio_coding/neteq/mute_signal.c \ - third_party/webrtc/modules/audio_coding/neteq/normal.c \ - third_party/webrtc/modules/audio_coding/neteq/packet_buffer.c \ - third_party/webrtc/modules/audio_coding/neteq/peak_detection.c \ - third_party/webrtc/modules/audio_coding/neteq/preemptive_expand.c \ - third_party/webrtc/modules/audio_coding/neteq/random_vector.c \ - third_party/webrtc/modules/audio_coding/neteq/recin.c \ - third_party/webrtc/modules/audio_coding/neteq/recout.c \ - third_party/webrtc/modules/audio_coding/neteq/rtcp.c \ - third_party/webrtc/modules/audio_coding/neteq/rtp.c \ - third_party/webrtc/modules/audio_coding/neteq/set_fs.c \ - third_party/webrtc/modules/audio_coding/neteq/signal_mcu.c \ - third_party/webrtc/modules/audio_coding/neteq/split_and_insert.c \ - third_party/webrtc/modules/audio_coding/neteq/unmute_signal.c \ - third_party/webrtc/modules/audio_coding/neteq/webrtc_neteq.c - - -# Flags passed to both C and C++ files. -MY_CFLAGS_Debug := \ - -fstack-protector \ - --param=ssp-buffer-size=4 \ - -Werror \ - -fno-exceptions \ - -fno-strict-aliasing \ - -Wall \ - -Wno-unused-parameter \ - -Wno-missing-field-initializers \ - -fvisibility=hidden \ - -pipe \ - -fPIC \ - -Wno-unused-local-typedefs \ - -fno-builtin-cos \ - -fno-builtin-sin \ - -fno-builtin-cosf \ - -fno-builtin-sinf \ - -fno-builtin-cos \ - -fno-builtin-sin \ - -fno-builtin-cosf \ - -fno-builtin-sinf \ - -m64 \ - -march=x86-64 \ - -fuse-ld=gold \ - -ffunction-sections \ - -funwind-tables \ - -g \ - -fstack-protector \ - -fno-short-enums \ - -finline-limit=64 \ - -Wa,--noexecstack \ - -U_FORTIFY_SOURCE \ - -Wno-extra \ - -Wno-ignored-qualifiers \ - -Wno-type-limits \ - -Wno-unused-but-set-variable \ - -Os \ - -g \ - -fomit-frame-pointer \ - -fdata-sections \ - -ffunction-sections \ - -funwind-tables - -MY_DEFS_Debug := \ - '-DV8_DEPRECATION_WARNINGS' \ - '-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \ - '-D_FILE_OFFSET_BITS=64' \ - '-DNO_TCMALLOC' \ - '-DDISABLE_NACL' \ - '-DCHROMIUM_BUILD' \ - '-DUSE_LIBJPEG_TURBO=1' \ - '-DENABLE_WEBRTC=1' \ - '-DUSE_PROPRIETARY_CODECS' \ - '-DENABLE_CONFIGURATION_POLICY' \ - '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ - '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ - '-DENABLE_EGLIMAGE=1' \ - '-DCLD_VERSION=1' \ - '-DENABLE_PRINTING=1' \ - '-DENABLE_MANAGED_USERS=1' \ - '-DWEBRTC_RESTRICT_LOGGING' \ - '-DWEBRTC_MODULE_UTILITY_VIDEO' \ - '-DWEBRTC_CHROMIUM_BUILD' \ - '-DWEBRTC_POSIX' \ - '-DWEBRTC_LINUX' \ - '-DWEBRTC_ANDROID' \ - '-DWEBRTC_ANDROID_OPENSLES' \ - '-DNETEQ_VOICEENGINE_CODECS' \ - '-DSCRATCH' \ - '-DUSE_OPENSSL=1' \ - '-DUSE_OPENSSL_CERTS=1' \ - '-D__STDC_CONSTANT_MACROS' \ - '-D__STDC_FORMAT_MACROS' \ - '-DANDROID' \ - '-D__GNU_SOURCE=1' \ - '-DUSE_STLPORT=1' \ - '-D_STLP_USE_PTR_SPECIALIZATIONS=1' \ - '-DCHROME_BUILD_ID=""' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=1' \ - '-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \ - '-D_DEBUG' - - -# Include paths placed before CFLAGS/CPPFLAGS -LOCAL_C_INCLUDES_Debug := \ - $(LOCAL_PATH)/third_party \ - $(LOCAL_PATH) \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/neteq/interface \ - $(LOCAL_PATH)/third_party/webrtc \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/cng/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport - - -# Flags passed to only C++ (and not C) files. -LOCAL_CPPFLAGS_Debug := \ - -fno-rtti \ - -fno-threadsafe-statics \ - -fvisibility-inlines-hidden \ - -Wsign-compare \ - -Wno-non-virtual-dtor \ - -Wno-sign-promo - - -# Flags passed to both C and C++ files. -MY_CFLAGS_Release := \ - -fstack-protector \ - --param=ssp-buffer-size=4 \ - -Werror \ - -fno-exceptions \ - -fno-strict-aliasing \ - -Wall \ - -Wno-unused-parameter \ - -Wno-missing-field-initializers \ - -fvisibility=hidden \ - -pipe \ - -fPIC \ - -Wno-unused-local-typedefs \ - -fno-builtin-cos \ - -fno-builtin-sin \ - -fno-builtin-cosf \ - -fno-builtin-sinf \ - -fno-builtin-cos \ - -fno-builtin-sin \ - -fno-builtin-cosf \ - -fno-builtin-sinf \ - -m64 \ - -march=x86-64 \ - -fuse-ld=gold \ - -ffunction-sections \ - -funwind-tables \ - -g \ - -fstack-protector \ - -fno-short-enums \ - -finline-limit=64 \ - -Wa,--noexecstack \ - -U_FORTIFY_SOURCE \ - -Wno-extra \ - -Wno-ignored-qualifiers \ - -Wno-type-limits \ - -Wno-unused-but-set-variable \ - -Os \ - -fno-ident \ - -fdata-sections \ - -ffunction-sections \ - -fomit-frame-pointer \ - -funwind-tables - -MY_DEFS_Release := \ - '-DV8_DEPRECATION_WARNINGS' \ - '-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \ - '-D_FILE_OFFSET_BITS=64' \ - '-DNO_TCMALLOC' \ - '-DDISABLE_NACL' \ - '-DCHROMIUM_BUILD' \ - '-DUSE_LIBJPEG_TURBO=1' \ - '-DENABLE_WEBRTC=1' \ - '-DUSE_PROPRIETARY_CODECS' \ - '-DENABLE_CONFIGURATION_POLICY' \ - '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ - '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ - '-DENABLE_EGLIMAGE=1' \ - '-DCLD_VERSION=1' \ - '-DENABLE_PRINTING=1' \ - '-DENABLE_MANAGED_USERS=1' \ - '-DWEBRTC_RESTRICT_LOGGING' \ - '-DWEBRTC_MODULE_UTILITY_VIDEO' \ - '-DWEBRTC_CHROMIUM_BUILD' \ - '-DWEBRTC_POSIX' \ - '-DWEBRTC_LINUX' \ - '-DWEBRTC_ANDROID' \ - '-DWEBRTC_ANDROID_OPENSLES' \ - '-DNETEQ_VOICEENGINE_CODECS' \ - '-DSCRATCH' \ - '-DUSE_OPENSSL=1' \ - '-DUSE_OPENSSL_CERTS=1' \ - '-D__STDC_CONSTANT_MACROS' \ - '-D__STDC_FORMAT_MACROS' \ - '-DANDROID' \ - '-D__GNU_SOURCE=1' \ - '-DUSE_STLPORT=1' \ - '-D_STLP_USE_PTR_SPECIALIZATIONS=1' \ - '-DCHROME_BUILD_ID=""' \ - '-DNDEBUG' \ - '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-D_FORTIFY_SOURCE=2' - - -# Include paths placed before CFLAGS/CPPFLAGS -LOCAL_C_INCLUDES_Release := \ - $(LOCAL_PATH)/third_party \ - $(LOCAL_PATH) \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/neteq/interface \ - $(LOCAL_PATH)/third_party/webrtc \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/cng/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport - - -# Flags passed to only C++ (and not C) files. -LOCAL_CPPFLAGS_Release := \ - -fno-rtti \ - -fno-threadsafe-statics \ - -fvisibility-inlines-hidden \ - -Wsign-compare \ - -Wno-non-virtual-dtor \ - -Wno-sign-promo - - -LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) -LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) -LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) -LOCAL_ASFLAGS := $(LOCAL_CFLAGS) -### Rules for final target. - -LOCAL_LDFLAGS_Debug := \ - -Wl,-z,now \ - -Wl,-z,relro \ - -Wl,--fatal-warnings \ - -Wl,-z,noexecstack \ - -fPIC \ - -m64 \ - -fuse-ld=gold \ - -nostdlib \ - -Wl,--no-undefined \ - -Wl,--exclude-libs=ALL \ - -Wl,--warn-shared-textrel \ - -Wl,-O1 \ - -Wl,--as-needed - - -LOCAL_LDFLAGS_Release := \ - -Wl,-z,now \ - -Wl,-z,relro \ - -Wl,--fatal-warnings \ - -Wl,-z,noexecstack \ - -fPIC \ - -m64 \ - -fuse-ld=gold \ - -nostdlib \ - -Wl,--no-undefined \ - -Wl,--exclude-libs=ALL \ - -Wl,-O1 \ - -Wl,--as-needed \ - -Wl,--gc-sections \ - -Wl,--warn-shared-textrel - - -LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION)) - -LOCAL_STATIC_LIBRARIES := - -# Enable grouping to fix circular references -LOCAL_GROUP_STATIC_LIBRARIES := true - -LOCAL_SHARED_LIBRARIES := \ - libstlport \ - libdl - -# Add target alias to "gyp_all_modules" target. -.PHONY: gyp_all_modules -gyp_all_modules: third_party_webrtc_modules_NetEq_gyp - -# Alias gyp target name. -.PHONY: NetEq -NetEq: third_party_webrtc_modules_NetEq_gyp - -include $(BUILD_STATIC_LIBRARY) diff --git a/modules/NetEq.target.linux-arm.mk b/modules/NetEq.target.linux-arm.mk deleted file mode 100644 index f32b25ec..00000000 --- a/modules/NetEq.target.linux-arm.mk +++ /dev/null @@ -1,348 +0,0 @@ -# This file is generated by gyp; do not edit. - -include $(CLEAR_VARS) - -LOCAL_MODULE_CLASS := STATIC_LIBRARIES -LOCAL_MODULE := third_party_webrtc_modules_NetEq_gyp -LOCAL_MODULE_SUFFIX := .a -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) -gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) -gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) - -# Make sure our deps are built first. -GYP_TARGET_DEPENDENCIES := - -GYP_GENERATED_OUTPUTS := - -# Make sure our deps and generated files are built first. -LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS) - -LOCAL_GENERATED_SOURCES := - -GYP_COPIED_SOURCE_ORIGIN_DIRS := - -LOCAL_SRC_FILES := \ - third_party/webrtc/modules/audio_coding/neteq/accelerate.c \ - third_party/webrtc/modules/audio_coding/neteq/automode.c \ - third_party/webrtc/modules/audio_coding/neteq/bgn_update.c \ - third_party/webrtc/modules/audio_coding/neteq/bufstats_decision.c \ - third_party/webrtc/modules/audio_coding/neteq/cng_internal.c \ - third_party/webrtc/modules/audio_coding/neteq/codec_db.c \ - third_party/webrtc/modules/audio_coding/neteq/correlator.c \ - third_party/webrtc/modules/audio_coding/neteq/dsp.c \ - third_party/webrtc/modules/audio_coding/neteq/dsp_helpfunctions.c \ - third_party/webrtc/modules/audio_coding/neteq/dtmf_buffer.c \ - third_party/webrtc/modules/audio_coding/neteq/dtmf_tonegen.c \ - third_party/webrtc/modules/audio_coding/neteq/expand.c \ - third_party/webrtc/modules/audio_coding/neteq/mcu_address_init.c \ - third_party/webrtc/modules/audio_coding/neteq/mcu_dsp_common.c \ - third_party/webrtc/modules/audio_coding/neteq/mcu_reset.c \ - third_party/webrtc/modules/audio_coding/neteq/merge.c \ - third_party/webrtc/modules/audio_coding/neteq/min_distortion.c \ - third_party/webrtc/modules/audio_coding/neteq/mix_voice_unvoice.c \ - third_party/webrtc/modules/audio_coding/neteq/mute_signal.c \ - third_party/webrtc/modules/audio_coding/neteq/normal.c \ - third_party/webrtc/modules/audio_coding/neteq/packet_buffer.c \ - third_party/webrtc/modules/audio_coding/neteq/peak_detection.c \ - third_party/webrtc/modules/audio_coding/neteq/preemptive_expand.c \ - third_party/webrtc/modules/audio_coding/neteq/random_vector.c \ - third_party/webrtc/modules/audio_coding/neteq/recin.c \ - third_party/webrtc/modules/audio_coding/neteq/recout.c \ - third_party/webrtc/modules/audio_coding/neteq/rtcp.c \ - third_party/webrtc/modules/audio_coding/neteq/rtp.c \ - third_party/webrtc/modules/audio_coding/neteq/set_fs.c \ - third_party/webrtc/modules/audio_coding/neteq/signal_mcu.c \ - third_party/webrtc/modules/audio_coding/neteq/split_and_insert.c \ - third_party/webrtc/modules/audio_coding/neteq/unmute_signal.c \ - third_party/webrtc/modules/audio_coding/neteq/webrtc_neteq.c - - -# Flags passed to both C and C++ files. -MY_CFLAGS_Debug := \ - -fstack-protector \ - --param=ssp-buffer-size=4 \ - -Werror \ - -fno-exceptions \ - -fno-strict-aliasing \ - -Wall \ - -Wno-unused-parameter \ - -Wno-missing-field-initializers \ - -fvisibility=hidden \ - -pipe \ - -fPIC \ - -fno-builtin-cos \ - -fno-builtin-sin \ - -fno-builtin-cosf \ - -fno-builtin-sinf \ - -fno-builtin-cos \ - -fno-builtin-sin \ - -fno-builtin-cosf \ - -fno-builtin-sinf \ - -fno-tree-sra \ - -fuse-ld=gold \ - -Wno-psabi \ - -ffunction-sections \ - -funwind-tables \ - -g \ - -fstack-protector \ - -fno-short-enums \ - -finline-limit=64 \ - -Wa,--noexecstack \ - -U_FORTIFY_SOURCE \ - -Wno-extra \ - -Wno-ignored-qualifiers \ - -Wno-type-limits \ - -Wno-unused-but-set-variable \ - -Os \ - -g \ - -fomit-frame-pointer \ - -fdata-sections \ - -ffunction-sections \ - -funwind-tables - -MY_DEFS_Debug := \ - '-DV8_DEPRECATION_WARNINGS' \ - '-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \ - '-D_FILE_OFFSET_BITS=64' \ - '-DNO_TCMALLOC' \ - '-DDISABLE_NACL' \ - '-DCHROMIUM_BUILD' \ - '-DUSE_LIBJPEG_TURBO=1' \ - '-DENABLE_WEBRTC=1' \ - '-DUSE_PROPRIETARY_CODECS' \ - '-DENABLE_CONFIGURATION_POLICY' \ - '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ - '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ - '-DENABLE_EGLIMAGE=1' \ - '-DCLD_VERSION=1' \ - '-DENABLE_PRINTING=1' \ - '-DENABLE_MANAGED_USERS=1' \ - '-DWEBRTC_RESTRICT_LOGGING' \ - '-DWEBRTC_MODULE_UTILITY_VIDEO' \ - '-DWEBRTC_CHROMIUM_BUILD' \ - '-DWEBRTC_ARCH_ARM' \ - '-DWEBRTC_ARCH_ARM_V7' \ - '-DWEBRTC_DETECT_ARM_NEON' \ - '-DWEBRTC_POSIX' \ - '-DWEBRTC_LINUX' \ - '-DWEBRTC_ANDROID' \ - '-DWEBRTC_ANDROID_OPENSLES' \ - '-DNETEQ_VOICEENGINE_CODECS' \ - '-DSCRATCH' \ - '-DUSE_OPENSSL=1' \ - '-DUSE_OPENSSL_CERTS=1' \ - '-D__STDC_CONSTANT_MACROS' \ - '-D__STDC_FORMAT_MACROS' \ - '-DANDROID' \ - '-D__GNU_SOURCE=1' \ - '-DUSE_STLPORT=1' \ - '-D_STLP_USE_PTR_SPECIALIZATIONS=1' \ - '-DCHROME_BUILD_ID=""' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=1' \ - '-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \ - '-D_DEBUG' - - -# Include paths placed before CFLAGS/CPPFLAGS -LOCAL_C_INCLUDES_Debug := \ - $(LOCAL_PATH)/third_party \ - $(LOCAL_PATH) \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/neteq/interface \ - $(LOCAL_PATH)/third_party/webrtc \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/cng/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport - - -# Flags passed to only C++ (and not C) files. -LOCAL_CPPFLAGS_Debug := \ - -fno-rtti \ - -fno-threadsafe-statics \ - -fvisibility-inlines-hidden \ - -Wsign-compare \ - -Wno-abi \ - -Wno-non-virtual-dtor \ - -Wno-sign-promo - - -# Flags passed to both C and C++ files. -MY_CFLAGS_Release := \ - -fstack-protector \ - --param=ssp-buffer-size=4 \ - -Werror \ - -fno-exceptions \ - -fno-strict-aliasing \ - -Wall \ - -Wno-unused-parameter \ - -Wno-missing-field-initializers \ - -fvisibility=hidden \ - -pipe \ - -fPIC \ - -fno-builtin-cos \ - -fno-builtin-sin \ - -fno-builtin-cosf \ - -fno-builtin-sinf \ - -fno-builtin-cos \ - -fno-builtin-sin \ - -fno-builtin-cosf \ - -fno-builtin-sinf \ - -fno-tree-sra \ - -fuse-ld=gold \ - -Wno-psabi \ - -ffunction-sections \ - -funwind-tables \ - -g \ - -fstack-protector \ - -fno-short-enums \ - -finline-limit=64 \ - -Wa,--noexecstack \ - -U_FORTIFY_SOURCE \ - -Wno-extra \ - -Wno-ignored-qualifiers \ - -Wno-type-limits \ - -Wno-unused-but-set-variable \ - -Os \ - -fno-ident \ - -fdata-sections \ - -ffunction-sections \ - -fomit-frame-pointer \ - -funwind-tables - -MY_DEFS_Release := \ - '-DV8_DEPRECATION_WARNINGS' \ - '-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \ - '-D_FILE_OFFSET_BITS=64' \ - '-DNO_TCMALLOC' \ - '-DDISABLE_NACL' \ - '-DCHROMIUM_BUILD' \ - '-DUSE_LIBJPEG_TURBO=1' \ - '-DENABLE_WEBRTC=1' \ - '-DUSE_PROPRIETARY_CODECS' \ - '-DENABLE_CONFIGURATION_POLICY' \ - '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ - '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ - '-DENABLE_EGLIMAGE=1' \ - '-DCLD_VERSION=1' \ - '-DENABLE_PRINTING=1' \ - '-DENABLE_MANAGED_USERS=1' \ - '-DWEBRTC_RESTRICT_LOGGING' \ - '-DWEBRTC_MODULE_UTILITY_VIDEO' \ - '-DWEBRTC_CHROMIUM_BUILD' \ - '-DWEBRTC_ARCH_ARM' \ - '-DWEBRTC_ARCH_ARM_V7' \ - '-DWEBRTC_DETECT_ARM_NEON' \ - '-DWEBRTC_POSIX' \ - '-DWEBRTC_LINUX' \ - '-DWEBRTC_ANDROID' \ - '-DWEBRTC_ANDROID_OPENSLES' \ - '-DNETEQ_VOICEENGINE_CODECS' \ - '-DSCRATCH' \ - '-DUSE_OPENSSL=1' \ - '-DUSE_OPENSSL_CERTS=1' \ - '-D__STDC_CONSTANT_MACROS' \ - '-D__STDC_FORMAT_MACROS' \ - '-DANDROID' \ - '-D__GNU_SOURCE=1' \ - '-DUSE_STLPORT=1' \ - '-D_STLP_USE_PTR_SPECIALIZATIONS=1' \ - '-DCHROME_BUILD_ID=""' \ - '-DNDEBUG' \ - '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-D_FORTIFY_SOURCE=2' - - -# Include paths placed before CFLAGS/CPPFLAGS -LOCAL_C_INCLUDES_Release := \ - $(LOCAL_PATH)/third_party \ - $(LOCAL_PATH) \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/neteq/interface \ - $(LOCAL_PATH)/third_party/webrtc \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/cng/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport - - -# Flags passed to only C++ (and not C) files. -LOCAL_CPPFLAGS_Release := \ - -fno-rtti \ - -fno-threadsafe-statics \ - -fvisibility-inlines-hidden \ - -Wsign-compare \ - -Wno-abi \ - -Wno-non-virtual-dtor \ - -Wno-sign-promo - - -LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) -LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) -LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) -LOCAL_ASFLAGS := $(LOCAL_CFLAGS) -### Rules for final target. - -LOCAL_LDFLAGS_Debug := \ - -Wl,-z,now \ - -Wl,-z,relro \ - -Wl,--fatal-warnings \ - -Wl,-z,noexecstack \ - -fPIC \ - -Wl,-z,relro \ - -Wl,-z,now \ - -fuse-ld=gold \ - -nostdlib \ - -Wl,--no-undefined \ - -Wl,--exclude-libs=ALL \ - -Wl,--icf=safe \ - -Wl,--warn-shared-textrel \ - -Wl,-O1 \ - -Wl,--as-needed - - -LOCAL_LDFLAGS_Release := \ - -Wl,-z,now \ - -Wl,-z,relro \ - -Wl,--fatal-warnings \ - -Wl,-z,noexecstack \ - -fPIC \ - -Wl,-z,relro \ - -Wl,-z,now \ - -fuse-ld=gold \ - -nostdlib \ - -Wl,--no-undefined \ - -Wl,--exclude-libs=ALL \ - -Wl,--icf=safe \ - -Wl,-O1 \ - -Wl,--as-needed \ - -Wl,--gc-sections \ - -Wl,--warn-shared-textrel - - -LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION)) - -LOCAL_STATIC_LIBRARIES := - -# Enable grouping to fix circular references -LOCAL_GROUP_STATIC_LIBRARIES := true - -LOCAL_SHARED_LIBRARIES := \ - libstlport \ - libdl - -# Add target alias to "gyp_all_modules" target. -.PHONY: gyp_all_modules -gyp_all_modules: third_party_webrtc_modules_NetEq_gyp - -# Alias gyp target name. -.PHONY: NetEq -NetEq: third_party_webrtc_modules_NetEq_gyp - -include $(BUILD_STATIC_LIBRARY) diff --git a/modules/NetEq.target.linux-arm64.mk b/modules/NetEq.target.linux-arm64.mk deleted file mode 100644 index 7bbf5e00..00000000 --- a/modules/NetEq.target.linux-arm64.mk +++ /dev/null @@ -1,324 +0,0 @@ -# This file is generated by gyp; do not edit. - -include $(CLEAR_VARS) - -LOCAL_MODULE_CLASS := STATIC_LIBRARIES -LOCAL_MODULE := third_party_webrtc_modules_NetEq_gyp -LOCAL_MODULE_SUFFIX := .a -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) -gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) -gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) - -# Make sure our deps are built first. -GYP_TARGET_DEPENDENCIES := - -GYP_GENERATED_OUTPUTS := - -# Make sure our deps and generated files are built first. -LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS) - -LOCAL_GENERATED_SOURCES := - -GYP_COPIED_SOURCE_ORIGIN_DIRS := - -LOCAL_SRC_FILES := \ - third_party/webrtc/modules/audio_coding/neteq/accelerate.c \ - third_party/webrtc/modules/audio_coding/neteq/automode.c \ - third_party/webrtc/modules/audio_coding/neteq/bgn_update.c \ - third_party/webrtc/modules/audio_coding/neteq/bufstats_decision.c \ - third_party/webrtc/modules/audio_coding/neteq/cng_internal.c \ - third_party/webrtc/modules/audio_coding/neteq/codec_db.c \ - third_party/webrtc/modules/audio_coding/neteq/correlator.c \ - third_party/webrtc/modules/audio_coding/neteq/dsp.c \ - third_party/webrtc/modules/audio_coding/neteq/dsp_helpfunctions.c \ - third_party/webrtc/modules/audio_coding/neteq/dtmf_buffer.c \ - third_party/webrtc/modules/audio_coding/neteq/dtmf_tonegen.c \ - third_party/webrtc/modules/audio_coding/neteq/expand.c \ - third_party/webrtc/modules/audio_coding/neteq/mcu_address_init.c \ - third_party/webrtc/modules/audio_coding/neteq/mcu_dsp_common.c \ - third_party/webrtc/modules/audio_coding/neteq/mcu_reset.c \ - third_party/webrtc/modules/audio_coding/neteq/merge.c \ - third_party/webrtc/modules/audio_coding/neteq/min_distortion.c \ - third_party/webrtc/modules/audio_coding/neteq/mix_voice_unvoice.c \ - third_party/webrtc/modules/audio_coding/neteq/mute_signal.c \ - third_party/webrtc/modules/audio_coding/neteq/normal.c \ - third_party/webrtc/modules/audio_coding/neteq/packet_buffer.c \ - third_party/webrtc/modules/audio_coding/neteq/peak_detection.c \ - third_party/webrtc/modules/audio_coding/neteq/preemptive_expand.c \ - third_party/webrtc/modules/audio_coding/neteq/random_vector.c \ - third_party/webrtc/modules/audio_coding/neteq/recin.c \ - third_party/webrtc/modules/audio_coding/neteq/recout.c \ - third_party/webrtc/modules/audio_coding/neteq/rtcp.c \ - third_party/webrtc/modules/audio_coding/neteq/rtp.c \ - third_party/webrtc/modules/audio_coding/neteq/set_fs.c \ - third_party/webrtc/modules/audio_coding/neteq/signal_mcu.c \ - third_party/webrtc/modules/audio_coding/neteq/split_and_insert.c \ - third_party/webrtc/modules/audio_coding/neteq/unmute_signal.c \ - third_party/webrtc/modules/audio_coding/neteq/webrtc_neteq.c - - -# Flags passed to both C and C++ files. -MY_CFLAGS_Debug := \ - --param=ssp-buffer-size=4 \ - -Werror \ - -fno-exceptions \ - -fno-strict-aliasing \ - -Wall \ - -Wno-unused-parameter \ - -Wno-missing-field-initializers \ - -fvisibility=hidden \ - -pipe \ - -fPIC \ - -Wno-unused-local-typedefs \ - -fno-builtin-cos \ - -fno-builtin-sin \ - -fno-builtin-cosf \ - -fno-builtin-sinf \ - -fno-builtin-cos \ - -fno-builtin-sin \ - -fno-builtin-cosf \ - -fno-builtin-sinf \ - -ffunction-sections \ - -funwind-tables \ - -g \ - -fno-short-enums \ - -finline-limit=64 \ - -Wa,--noexecstack \ - -U_FORTIFY_SOURCE \ - -Wno-extra \ - -Wno-ignored-qualifiers \ - -Wno-type-limits \ - -Wno-unused-but-set-variable \ - -Os \ - -g \ - -fomit-frame-pointer \ - -fdata-sections \ - -ffunction-sections \ - -funwind-tables - -MY_DEFS_Debug := \ - '-DV8_DEPRECATION_WARNINGS' \ - '-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \ - '-D_FILE_OFFSET_BITS=64' \ - '-DNO_TCMALLOC' \ - '-DDISABLE_NACL' \ - '-DCHROMIUM_BUILD' \ - '-DUSE_LIBJPEG_TURBO=1' \ - '-DENABLE_WEBRTC=1' \ - '-DUSE_PROPRIETARY_CODECS' \ - '-DENABLE_CONFIGURATION_POLICY' \ - '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ - '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ - '-DENABLE_EGLIMAGE=1' \ - '-DCLD_VERSION=1' \ - '-DENABLE_PRINTING=1' \ - '-DENABLE_MANAGED_USERS=1' \ - '-DWEBRTC_RESTRICT_LOGGING' \ - '-DWEBRTC_MODULE_UTILITY_VIDEO' \ - '-DWEBRTC_CHROMIUM_BUILD' \ - '-DWEBRTC_POSIX' \ - '-DWEBRTC_LINUX' \ - '-DWEBRTC_ANDROID' \ - '-DWEBRTC_ANDROID_OPENSLES' \ - '-DNETEQ_VOICEENGINE_CODECS' \ - '-DSCRATCH' \ - '-DUSE_OPENSSL=1' \ - '-DUSE_OPENSSL_CERTS=1' \ - '-D__STDC_CONSTANT_MACROS' \ - '-D__STDC_FORMAT_MACROS' \ - '-DANDROID' \ - '-D__GNU_SOURCE=1' \ - '-DUSE_STLPORT=1' \ - '-D_STLP_USE_PTR_SPECIALIZATIONS=1' \ - '-DCHROME_BUILD_ID=""' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=1' \ - '-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \ - '-D_DEBUG' - - -# Include paths placed before CFLAGS/CPPFLAGS -LOCAL_C_INCLUDES_Debug := \ - $(LOCAL_PATH)/third_party \ - $(LOCAL_PATH) \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/neteq/interface \ - $(LOCAL_PATH)/third_party/webrtc \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/cng/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport - - -# Flags passed to only C++ (and not C) files. -LOCAL_CPPFLAGS_Debug := \ - -fno-rtti \ - -fno-threadsafe-statics \ - -fvisibility-inlines-hidden \ - -Wsign-compare \ - -Wno-non-virtual-dtor \ - -Wno-sign-promo - - -# Flags passed to both C and C++ files. -MY_CFLAGS_Release := \ - --param=ssp-buffer-size=4 \ - -Werror \ - -fno-exceptions \ - -fno-strict-aliasing \ - -Wall \ - -Wno-unused-parameter \ - -Wno-missing-field-initializers \ - -fvisibility=hidden \ - -pipe \ - -fPIC \ - -Wno-unused-local-typedefs \ - -fno-builtin-cos \ - -fno-builtin-sin \ - -fno-builtin-cosf \ - -fno-builtin-sinf \ - -fno-builtin-cos \ - -fno-builtin-sin \ - -fno-builtin-cosf \ - -fno-builtin-sinf \ - -ffunction-sections \ - -funwind-tables \ - -g \ - -fno-short-enums \ - -finline-limit=64 \ - -Wa,--noexecstack \ - -U_FORTIFY_SOURCE \ - -Wno-extra \ - -Wno-ignored-qualifiers \ - -Wno-type-limits \ - -Wno-unused-but-set-variable \ - -Os \ - -fno-ident \ - -fdata-sections \ - -ffunction-sections \ - -fomit-frame-pointer \ - -funwind-tables - -MY_DEFS_Release := \ - '-DV8_DEPRECATION_WARNINGS' \ - '-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \ - '-D_FILE_OFFSET_BITS=64' \ - '-DNO_TCMALLOC' \ - '-DDISABLE_NACL' \ - '-DCHROMIUM_BUILD' \ - '-DUSE_LIBJPEG_TURBO=1' \ - '-DENABLE_WEBRTC=1' \ - '-DUSE_PROPRIETARY_CODECS' \ - '-DENABLE_CONFIGURATION_POLICY' \ - '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ - '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ - '-DENABLE_EGLIMAGE=1' \ - '-DCLD_VERSION=1' \ - '-DENABLE_PRINTING=1' \ - '-DENABLE_MANAGED_USERS=1' \ - '-DWEBRTC_RESTRICT_LOGGING' \ - '-DWEBRTC_MODULE_UTILITY_VIDEO' \ - '-DWEBRTC_CHROMIUM_BUILD' \ - '-DWEBRTC_POSIX' \ - '-DWEBRTC_LINUX' \ - '-DWEBRTC_ANDROID' \ - '-DWEBRTC_ANDROID_OPENSLES' \ - '-DNETEQ_VOICEENGINE_CODECS' \ - '-DSCRATCH' \ - '-DUSE_OPENSSL=1' \ - '-DUSE_OPENSSL_CERTS=1' \ - '-D__STDC_CONSTANT_MACROS' \ - '-D__STDC_FORMAT_MACROS' \ - '-DANDROID' \ - '-D__GNU_SOURCE=1' \ - '-DUSE_STLPORT=1' \ - '-D_STLP_USE_PTR_SPECIALIZATIONS=1' \ - '-DCHROME_BUILD_ID=""' \ - '-DNDEBUG' \ - '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-D_FORTIFY_SOURCE=2' - - -# Include paths placed before CFLAGS/CPPFLAGS -LOCAL_C_INCLUDES_Release := \ - $(LOCAL_PATH)/third_party \ - $(LOCAL_PATH) \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/neteq/interface \ - $(LOCAL_PATH)/third_party/webrtc \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/cng/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport - - -# Flags passed to only C++ (and not C) files. -LOCAL_CPPFLAGS_Release := \ - -fno-rtti \ - -fno-threadsafe-statics \ - -fvisibility-inlines-hidden \ - -Wsign-compare \ - -Wno-non-virtual-dtor \ - -Wno-sign-promo - - -LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) -LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) -LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) -LOCAL_ASFLAGS := $(LOCAL_CFLAGS) -### Rules for final target. - -LOCAL_LDFLAGS_Debug := \ - -Wl,-z,now \ - -Wl,-z,relro \ - -Wl,--fatal-warnings \ - -Wl,-z,noexecstack \ - -fPIC \ - -nostdlib \ - -Wl,--no-undefined \ - -Wl,--exclude-libs=ALL \ - -Wl,--warn-shared-textrel \ - -Wl,-O1 \ - -Wl,--as-needed - - -LOCAL_LDFLAGS_Release := \ - -Wl,-z,now \ - -Wl,-z,relro \ - -Wl,--fatal-warnings \ - -Wl,-z,noexecstack \ - -fPIC \ - -nostdlib \ - -Wl,--no-undefined \ - -Wl,--exclude-libs=ALL \ - -Wl,-O1 \ - -Wl,--as-needed \ - -Wl,--gc-sections \ - -Wl,--warn-shared-textrel - - -LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION)) - -LOCAL_STATIC_LIBRARIES := - -# Enable grouping to fix circular references -LOCAL_GROUP_STATIC_LIBRARIES := true - -LOCAL_SHARED_LIBRARIES := \ - libstlport \ - libdl - -# Add target alias to "gyp_all_modules" target. -.PHONY: gyp_all_modules -gyp_all_modules: third_party_webrtc_modules_NetEq_gyp - -# Alias gyp target name. -.PHONY: NetEq -NetEq: third_party_webrtc_modules_NetEq_gyp - -include $(BUILD_STATIC_LIBRARY) diff --git a/modules/NetEq.target.linux-mips.mk b/modules/NetEq.target.linux-mips.mk deleted file mode 100644 index 240cc6c1..00000000 --- a/modules/NetEq.target.linux-mips.mk +++ /dev/null @@ -1,344 +0,0 @@ -# This file is generated by gyp; do not edit. - -include $(CLEAR_VARS) - -LOCAL_MODULE_CLASS := STATIC_LIBRARIES -LOCAL_MODULE := third_party_webrtc_modules_NetEq_gyp -LOCAL_MODULE_SUFFIX := .a -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) -gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) -gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) - -# Make sure our deps are built first. -GYP_TARGET_DEPENDENCIES := - -GYP_GENERATED_OUTPUTS := - -# Make sure our deps and generated files are built first. -LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS) - -LOCAL_GENERATED_SOURCES := - -GYP_COPIED_SOURCE_ORIGIN_DIRS := - -LOCAL_SRC_FILES := \ - third_party/webrtc/modules/audio_coding/neteq/accelerate.c \ - third_party/webrtc/modules/audio_coding/neteq/automode.c \ - third_party/webrtc/modules/audio_coding/neteq/bgn_update.c \ - third_party/webrtc/modules/audio_coding/neteq/bufstats_decision.c \ - third_party/webrtc/modules/audio_coding/neteq/cng_internal.c \ - third_party/webrtc/modules/audio_coding/neteq/codec_db.c \ - third_party/webrtc/modules/audio_coding/neteq/correlator.c \ - third_party/webrtc/modules/audio_coding/neteq/dsp.c \ - third_party/webrtc/modules/audio_coding/neteq/dsp_helpfunctions.c \ - third_party/webrtc/modules/audio_coding/neteq/dtmf_buffer.c \ - third_party/webrtc/modules/audio_coding/neteq/dtmf_tonegen.c \ - third_party/webrtc/modules/audio_coding/neteq/expand.c \ - third_party/webrtc/modules/audio_coding/neteq/mcu_address_init.c \ - third_party/webrtc/modules/audio_coding/neteq/mcu_dsp_common.c \ - third_party/webrtc/modules/audio_coding/neteq/mcu_reset.c \ - third_party/webrtc/modules/audio_coding/neteq/merge.c \ - third_party/webrtc/modules/audio_coding/neteq/min_distortion.c \ - third_party/webrtc/modules/audio_coding/neteq/mix_voice_unvoice.c \ - third_party/webrtc/modules/audio_coding/neteq/mute_signal.c \ - third_party/webrtc/modules/audio_coding/neteq/normal.c \ - third_party/webrtc/modules/audio_coding/neteq/packet_buffer.c \ - third_party/webrtc/modules/audio_coding/neteq/peak_detection.c \ - third_party/webrtc/modules/audio_coding/neteq/preemptive_expand.c \ - third_party/webrtc/modules/audio_coding/neteq/random_vector.c \ - third_party/webrtc/modules/audio_coding/neteq/recin.c \ - third_party/webrtc/modules/audio_coding/neteq/recout.c \ - third_party/webrtc/modules/audio_coding/neteq/rtcp.c \ - third_party/webrtc/modules/audio_coding/neteq/rtp.c \ - third_party/webrtc/modules/audio_coding/neteq/set_fs.c \ - third_party/webrtc/modules/audio_coding/neteq/signal_mcu.c \ - third_party/webrtc/modules/audio_coding/neteq/split_and_insert.c \ - third_party/webrtc/modules/audio_coding/neteq/unmute_signal.c \ - third_party/webrtc/modules/audio_coding/neteq/webrtc_neteq.c - - -# Flags passed to both C and C++ files. -MY_CFLAGS_Debug := \ - -fstack-protector \ - --param=ssp-buffer-size=4 \ - \ - -fno-exceptions \ - -fno-strict-aliasing \ - -Wall \ - -Wno-unused-parameter \ - -Wno-missing-field-initializers \ - -fvisibility=hidden \ - -pipe \ - -fPIC \ - -mhard-float \ - -fno-builtin-cos \ - -fno-builtin-sin \ - -fno-builtin-cosf \ - -fno-builtin-sinf \ - -mhard-float \ - -fno-builtin-cos \ - -fno-builtin-sin \ - -fno-builtin-cosf \ - -fno-builtin-sinf \ - -EL \ - -mhard-float \ - -ffunction-sections \ - -funwind-tables \ - -g \ - -fstack-protector \ - -fno-short-enums \ - -finline-limit=64 \ - -Wa,--noexecstack \ - -U_FORTIFY_SOURCE \ - -Wno-extra \ - -Wno-ignored-qualifiers \ - -Wno-type-limits \ - -Wno-unused-but-set-variable \ - -Os \ - -g \ - -fomit-frame-pointer \ - -fdata-sections \ - -ffunction-sections \ - -funwind-tables - -MY_DEFS_Debug := \ - '-DV8_DEPRECATION_WARNINGS' \ - '-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \ - '-D_FILE_OFFSET_BITS=64' \ - '-DNO_TCMALLOC' \ - '-DDISABLE_NACL' \ - '-DCHROMIUM_BUILD' \ - '-DUSE_LIBJPEG_TURBO=1' \ - '-DENABLE_WEBRTC=1' \ - '-DUSE_PROPRIETARY_CODECS' \ - '-DENABLE_CONFIGURATION_POLICY' \ - '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ - '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ - '-DENABLE_EGLIMAGE=1' \ - '-DCLD_VERSION=1' \ - '-DENABLE_PRINTING=1' \ - '-DENABLE_MANAGED_USERS=1' \ - '-DWEBRTC_RESTRICT_LOGGING' \ - '-DWEBRTC_MODULE_UTILITY_VIDEO' \ - '-DWEBRTC_CHROMIUM_BUILD' \ - '-DMIPS32_LE' \ - '-DMIPS_FPU_LE' \ - '-DWEBRTC_POSIX' \ - '-DWEBRTC_LINUX' \ - '-DWEBRTC_ANDROID' \ - '-DWEBRTC_ANDROID_OPENSLES' \ - '-DNETEQ_VOICEENGINE_CODECS' \ - '-DSCRATCH' \ - '-DUSE_OPENSSL=1' \ - '-DUSE_OPENSSL_CERTS=1' \ - '-D__STDC_CONSTANT_MACROS' \ - '-D__STDC_FORMAT_MACROS' \ - '-DANDROID' \ - '-D__GNU_SOURCE=1' \ - '-DUSE_STLPORT=1' \ - '-D_STLP_USE_PTR_SPECIALIZATIONS=1' \ - '-DCHROME_BUILD_ID=""' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=1' \ - '-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \ - '-D_DEBUG' - - -# Include paths placed before CFLAGS/CPPFLAGS -LOCAL_C_INCLUDES_Debug := \ - $(LOCAL_PATH)/third_party \ - $(LOCAL_PATH) \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/neteq/interface \ - $(LOCAL_PATH)/third_party/webrtc \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/cng/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport - - -# Flags passed to only C++ (and not C) files. -LOCAL_CPPFLAGS_Debug := \ - -fno-rtti \ - -fno-threadsafe-statics \ - -fvisibility-inlines-hidden \ - -Wsign-compare \ - -Wno-uninitialized \ - -Wno-non-virtual-dtor \ - -Wno-sign-promo - - -# Flags passed to both C and C++ files. -MY_CFLAGS_Release := \ - -fstack-protector \ - --param=ssp-buffer-size=4 \ - \ - -fno-exceptions \ - -fno-strict-aliasing \ - -Wall \ - -Wno-unused-parameter \ - -Wno-missing-field-initializers \ - -fvisibility=hidden \ - -pipe \ - -fPIC \ - -mhard-float \ - -fno-builtin-cos \ - -fno-builtin-sin \ - -fno-builtin-cosf \ - -fno-builtin-sinf \ - -mhard-float \ - -fno-builtin-cos \ - -fno-builtin-sin \ - -fno-builtin-cosf \ - -fno-builtin-sinf \ - -EL \ - -mhard-float \ - -ffunction-sections \ - -funwind-tables \ - -g \ - -fstack-protector \ - -fno-short-enums \ - -finline-limit=64 \ - -Wa,--noexecstack \ - -U_FORTIFY_SOURCE \ - -Wno-extra \ - -Wno-ignored-qualifiers \ - -Wno-type-limits \ - -Wno-unused-but-set-variable \ - -Os \ - -fno-ident \ - -fdata-sections \ - -ffunction-sections \ - -fomit-frame-pointer \ - -funwind-tables - -MY_DEFS_Release := \ - '-DV8_DEPRECATION_WARNINGS' \ - '-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \ - '-D_FILE_OFFSET_BITS=64' \ - '-DNO_TCMALLOC' \ - '-DDISABLE_NACL' \ - '-DCHROMIUM_BUILD' \ - '-DUSE_LIBJPEG_TURBO=1' \ - '-DENABLE_WEBRTC=1' \ - '-DUSE_PROPRIETARY_CODECS' \ - '-DENABLE_CONFIGURATION_POLICY' \ - '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ - '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ - '-DENABLE_EGLIMAGE=1' \ - '-DCLD_VERSION=1' \ - '-DENABLE_PRINTING=1' \ - '-DENABLE_MANAGED_USERS=1' \ - '-DWEBRTC_RESTRICT_LOGGING' \ - '-DWEBRTC_MODULE_UTILITY_VIDEO' \ - '-DWEBRTC_CHROMIUM_BUILD' \ - '-DMIPS32_LE' \ - '-DMIPS_FPU_LE' \ - '-DWEBRTC_POSIX' \ - '-DWEBRTC_LINUX' \ - '-DWEBRTC_ANDROID' \ - '-DWEBRTC_ANDROID_OPENSLES' \ - '-DNETEQ_VOICEENGINE_CODECS' \ - '-DSCRATCH' \ - '-DUSE_OPENSSL=1' \ - '-DUSE_OPENSSL_CERTS=1' \ - '-D__STDC_CONSTANT_MACROS' \ - '-D__STDC_FORMAT_MACROS' \ - '-DANDROID' \ - '-D__GNU_SOURCE=1' \ - '-DUSE_STLPORT=1' \ - '-D_STLP_USE_PTR_SPECIALIZATIONS=1' \ - '-DCHROME_BUILD_ID=""' \ - '-DNDEBUG' \ - '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-D_FORTIFY_SOURCE=2' - - -# Include paths placed before CFLAGS/CPPFLAGS -LOCAL_C_INCLUDES_Release := \ - $(LOCAL_PATH)/third_party \ - $(LOCAL_PATH) \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/neteq/interface \ - $(LOCAL_PATH)/third_party/webrtc \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/cng/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport - - -# Flags passed to only C++ (and not C) files. -LOCAL_CPPFLAGS_Release := \ - -fno-rtti \ - -fno-threadsafe-statics \ - -fvisibility-inlines-hidden \ - -Wsign-compare \ - -Wno-uninitialized \ - -Wno-non-virtual-dtor \ - -Wno-sign-promo - - -LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) -LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) -LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) -LOCAL_ASFLAGS := $(LOCAL_CFLAGS) -### Rules for final target. - -LOCAL_LDFLAGS_Debug := \ - -Wl,-z,now \ - -Wl,-z,relro \ - -Wl,--fatal-warnings \ - -Wl,-z,noexecstack \ - -fPIC \ - -EL \ - -Wl,--no-keep-memory \ - -nostdlib \ - -Wl,--no-undefined \ - -Wl,--exclude-libs=ALL \ - -Wl,--warn-shared-textrel \ - -Wl,-O1 \ - -Wl,--as-needed - - -LOCAL_LDFLAGS_Release := \ - -Wl,-z,now \ - -Wl,-z,relro \ - -Wl,--fatal-warnings \ - -Wl,-z,noexecstack \ - -fPIC \ - -EL \ - -Wl,--no-keep-memory \ - -nostdlib \ - -Wl,--no-undefined \ - -Wl,--exclude-libs=ALL \ - -Wl,-O1 \ - -Wl,--as-needed \ - -Wl,--gc-sections \ - -Wl,--warn-shared-textrel - - -LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION)) - -LOCAL_STATIC_LIBRARIES := - -# Enable grouping to fix circular references -LOCAL_GROUP_STATIC_LIBRARIES := true - -LOCAL_SHARED_LIBRARIES := \ - libstlport \ - libdl - -# Add target alias to "gyp_all_modules" target. -.PHONY: gyp_all_modules -gyp_all_modules: third_party_webrtc_modules_NetEq_gyp - -# Alias gyp target name. -.PHONY: NetEq -NetEq: third_party_webrtc_modules_NetEq_gyp - -include $(BUILD_STATIC_LIBRARY) diff --git a/modules/NetEq.target.linux-x86.mk b/modules/NetEq.target.linux-x86.mk deleted file mode 100644 index 3b05cd95..00000000 --- a/modules/NetEq.target.linux-x86.mk +++ /dev/null @@ -1,338 +0,0 @@ -# This file is generated by gyp; do not edit. - -include $(CLEAR_VARS) - -LOCAL_MODULE_CLASS := STATIC_LIBRARIES -LOCAL_MODULE := third_party_webrtc_modules_NetEq_gyp -LOCAL_MODULE_SUFFIX := .a -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) -gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) -gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) - -# Make sure our deps are built first. -GYP_TARGET_DEPENDENCIES := - -GYP_GENERATED_OUTPUTS := - -# Make sure our deps and generated files are built first. -LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS) - -LOCAL_GENERATED_SOURCES := - -GYP_COPIED_SOURCE_ORIGIN_DIRS := - -LOCAL_SRC_FILES := \ - third_party/webrtc/modules/audio_coding/neteq/accelerate.c \ - third_party/webrtc/modules/audio_coding/neteq/automode.c \ - third_party/webrtc/modules/audio_coding/neteq/bgn_update.c \ - third_party/webrtc/modules/audio_coding/neteq/bufstats_decision.c \ - third_party/webrtc/modules/audio_coding/neteq/cng_internal.c \ - third_party/webrtc/modules/audio_coding/neteq/codec_db.c \ - third_party/webrtc/modules/audio_coding/neteq/correlator.c \ - third_party/webrtc/modules/audio_coding/neteq/dsp.c \ - third_party/webrtc/modules/audio_coding/neteq/dsp_helpfunctions.c \ - third_party/webrtc/modules/audio_coding/neteq/dtmf_buffer.c \ - third_party/webrtc/modules/audio_coding/neteq/dtmf_tonegen.c \ - third_party/webrtc/modules/audio_coding/neteq/expand.c \ - third_party/webrtc/modules/audio_coding/neteq/mcu_address_init.c \ - third_party/webrtc/modules/audio_coding/neteq/mcu_dsp_common.c \ - third_party/webrtc/modules/audio_coding/neteq/mcu_reset.c \ - third_party/webrtc/modules/audio_coding/neteq/merge.c \ - third_party/webrtc/modules/audio_coding/neteq/min_distortion.c \ - third_party/webrtc/modules/audio_coding/neteq/mix_voice_unvoice.c \ - third_party/webrtc/modules/audio_coding/neteq/mute_signal.c \ - third_party/webrtc/modules/audio_coding/neteq/normal.c \ - third_party/webrtc/modules/audio_coding/neteq/packet_buffer.c \ - third_party/webrtc/modules/audio_coding/neteq/peak_detection.c \ - third_party/webrtc/modules/audio_coding/neteq/preemptive_expand.c \ - third_party/webrtc/modules/audio_coding/neteq/random_vector.c \ - third_party/webrtc/modules/audio_coding/neteq/recin.c \ - third_party/webrtc/modules/audio_coding/neteq/recout.c \ - third_party/webrtc/modules/audio_coding/neteq/rtcp.c \ - third_party/webrtc/modules/audio_coding/neteq/rtp.c \ - third_party/webrtc/modules/audio_coding/neteq/set_fs.c \ - third_party/webrtc/modules/audio_coding/neteq/signal_mcu.c \ - third_party/webrtc/modules/audio_coding/neteq/split_and_insert.c \ - third_party/webrtc/modules/audio_coding/neteq/unmute_signal.c \ - third_party/webrtc/modules/audio_coding/neteq/webrtc_neteq.c - - -# Flags passed to both C and C++ files. -MY_CFLAGS_Debug := \ - --param=ssp-buffer-size=4 \ - -Werror \ - -fno-exceptions \ - -fno-strict-aliasing \ - -Wall \ - -Wno-unused-parameter \ - -Wno-missing-field-initializers \ - -fvisibility=hidden \ - -pipe \ - -fPIC \ - -fno-builtin-cos \ - -fno-builtin-sin \ - -fno-builtin-cosf \ - -fno-builtin-sinf \ - -fno-builtin-cos \ - -fno-builtin-sin \ - -fno-builtin-cosf \ - -fno-builtin-sinf \ - -msse2 \ - -mfpmath=sse \ - -mmmx \ - -m32 \ - -fuse-ld=gold \ - -ffunction-sections \ - -funwind-tables \ - -g \ - -fno-short-enums \ - -finline-limit=64 \ - -Wa,--noexecstack \ - -U_FORTIFY_SOURCE \ - -Wno-extra \ - -Wno-ignored-qualifiers \ - -Wno-type-limits \ - -Wno-unused-but-set-variable \ - -fno-stack-protector \ - -Os \ - -g \ - -fomit-frame-pointer \ - -fdata-sections \ - -ffunction-sections \ - -funwind-tables - -MY_DEFS_Debug := \ - '-DV8_DEPRECATION_WARNINGS' \ - '-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \ - '-D_FILE_OFFSET_BITS=64' \ - '-DNO_TCMALLOC' \ - '-DDISABLE_NACL' \ - '-DCHROMIUM_BUILD' \ - '-DUSE_LIBJPEG_TURBO=1' \ - '-DENABLE_WEBRTC=1' \ - '-DUSE_PROPRIETARY_CODECS' \ - '-DENABLE_CONFIGURATION_POLICY' \ - '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ - '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ - '-DENABLE_EGLIMAGE=1' \ - '-DCLD_VERSION=1' \ - '-DENABLE_PRINTING=1' \ - '-DENABLE_MANAGED_USERS=1' \ - '-DWEBRTC_RESTRICT_LOGGING' \ - '-DWEBRTC_MODULE_UTILITY_VIDEO' \ - '-DWEBRTC_CHROMIUM_BUILD' \ - '-DWEBRTC_POSIX' \ - '-DWEBRTC_LINUX' \ - '-DWEBRTC_ANDROID' \ - '-DWEBRTC_ANDROID_OPENSLES' \ - '-DNETEQ_VOICEENGINE_CODECS' \ - '-DSCRATCH' \ - '-DUSE_OPENSSL=1' \ - '-DUSE_OPENSSL_CERTS=1' \ - '-D__STDC_CONSTANT_MACROS' \ - '-D__STDC_FORMAT_MACROS' \ - '-DANDROID' \ - '-D__GNU_SOURCE=1' \ - '-DUSE_STLPORT=1' \ - '-D_STLP_USE_PTR_SPECIALIZATIONS=1' \ - '-DCHROME_BUILD_ID=""' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=1' \ - '-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \ - '-D_DEBUG' - - -# Include paths placed before CFLAGS/CPPFLAGS -LOCAL_C_INCLUDES_Debug := \ - $(LOCAL_PATH)/third_party \ - $(LOCAL_PATH) \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/neteq/interface \ - $(LOCAL_PATH)/third_party/webrtc \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/cng/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport - - -# Flags passed to only C++ (and not C) files. -LOCAL_CPPFLAGS_Debug := \ - -fno-rtti \ - -fno-threadsafe-statics \ - -fvisibility-inlines-hidden \ - -Wsign-compare \ - -Wno-non-virtual-dtor \ - -Wno-sign-promo - - -# Flags passed to both C and C++ files. -MY_CFLAGS_Release := \ - --param=ssp-buffer-size=4 \ - -Werror \ - -fno-exceptions \ - -fno-strict-aliasing \ - -Wall \ - -Wno-unused-parameter \ - -Wno-missing-field-initializers \ - -fvisibility=hidden \ - -pipe \ - -fPIC \ - -fno-builtin-cos \ - -fno-builtin-sin \ - -fno-builtin-cosf \ - -fno-builtin-sinf \ - -fno-builtin-cos \ - -fno-builtin-sin \ - -fno-builtin-cosf \ - -fno-builtin-sinf \ - -msse2 \ - -mfpmath=sse \ - -mmmx \ - -m32 \ - -fuse-ld=gold \ - -ffunction-sections \ - -funwind-tables \ - -g \ - -fno-short-enums \ - -finline-limit=64 \ - -Wa,--noexecstack \ - -U_FORTIFY_SOURCE \ - -Wno-extra \ - -Wno-ignored-qualifiers \ - -Wno-type-limits \ - -Wno-unused-but-set-variable \ - -fno-stack-protector \ - -Os \ - -fno-ident \ - -fdata-sections \ - -ffunction-sections \ - -fomit-frame-pointer \ - -funwind-tables - -MY_DEFS_Release := \ - '-DV8_DEPRECATION_WARNINGS' \ - '-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \ - '-D_FILE_OFFSET_BITS=64' \ - '-DNO_TCMALLOC' \ - '-DDISABLE_NACL' \ - '-DCHROMIUM_BUILD' \ - '-DUSE_LIBJPEG_TURBO=1' \ - '-DENABLE_WEBRTC=1' \ - '-DUSE_PROPRIETARY_CODECS' \ - '-DENABLE_CONFIGURATION_POLICY' \ - '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ - '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ - '-DENABLE_EGLIMAGE=1' \ - '-DCLD_VERSION=1' \ - '-DENABLE_PRINTING=1' \ - '-DENABLE_MANAGED_USERS=1' \ - '-DWEBRTC_RESTRICT_LOGGING' \ - '-DWEBRTC_MODULE_UTILITY_VIDEO' \ - '-DWEBRTC_CHROMIUM_BUILD' \ - '-DWEBRTC_POSIX' \ - '-DWEBRTC_LINUX' \ - '-DWEBRTC_ANDROID' \ - '-DWEBRTC_ANDROID_OPENSLES' \ - '-DNETEQ_VOICEENGINE_CODECS' \ - '-DSCRATCH' \ - '-DUSE_OPENSSL=1' \ - '-DUSE_OPENSSL_CERTS=1' \ - '-D__STDC_CONSTANT_MACROS' \ - '-D__STDC_FORMAT_MACROS' \ - '-DANDROID' \ - '-D__GNU_SOURCE=1' \ - '-DUSE_STLPORT=1' \ - '-D_STLP_USE_PTR_SPECIALIZATIONS=1' \ - '-DCHROME_BUILD_ID=""' \ - '-DNDEBUG' \ - '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-D_FORTIFY_SOURCE=2' - - -# Include paths placed before CFLAGS/CPPFLAGS -LOCAL_C_INCLUDES_Release := \ - $(LOCAL_PATH)/third_party \ - $(LOCAL_PATH) \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/neteq/interface \ - $(LOCAL_PATH)/third_party/webrtc \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/cng/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport - - -# Flags passed to only C++ (and not C) files. -LOCAL_CPPFLAGS_Release := \ - -fno-rtti \ - -fno-threadsafe-statics \ - -fvisibility-inlines-hidden \ - -Wsign-compare \ - -Wno-non-virtual-dtor \ - -Wno-sign-promo - - -LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) -LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) -LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) -LOCAL_ASFLAGS := $(LOCAL_CFLAGS) -### Rules for final target. - -LOCAL_LDFLAGS_Debug := \ - -Wl,-z,now \ - -Wl,-z,relro \ - -Wl,--fatal-warnings \ - -Wl,-z,noexecstack \ - -fPIC \ - -m32 \ - -fuse-ld=gold \ - -nostdlib \ - -Wl,--no-undefined \ - -Wl,--exclude-libs=ALL \ - -Wl,--warn-shared-textrel \ - -Wl,-O1 \ - -Wl,--as-needed - - -LOCAL_LDFLAGS_Release := \ - -Wl,-z,now \ - -Wl,-z,relro \ - -Wl,--fatal-warnings \ - -Wl,-z,noexecstack \ - -fPIC \ - -m32 \ - -fuse-ld=gold \ - -nostdlib \ - -Wl,--no-undefined \ - -Wl,--exclude-libs=ALL \ - -Wl,-O1 \ - -Wl,--as-needed \ - -Wl,--gc-sections \ - -Wl,--warn-shared-textrel - - -LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION)) - -LOCAL_STATIC_LIBRARIES := - -# Enable grouping to fix circular references -LOCAL_GROUP_STATIC_LIBRARIES := true - -LOCAL_SHARED_LIBRARIES := \ - libstlport \ - libdl - -# Add target alias to "gyp_all_modules" target. -.PHONY: gyp_all_modules -gyp_all_modules: third_party_webrtc_modules_NetEq_gyp - -# Alias gyp target name. -.PHONY: NetEq -NetEq: third_party_webrtc_modules_NetEq_gyp - -include $(BUILD_STATIC_LIBRARY) diff --git a/modules/NetEq.target.linux-x86_64.mk b/modules/NetEq.target.linux-x86_64.mk deleted file mode 100644 index c84869c1..00000000 --- a/modules/NetEq.target.linux-x86_64.mk +++ /dev/null @@ -1,338 +0,0 @@ -# This file is generated by gyp; do not edit. - -include $(CLEAR_VARS) - -LOCAL_MODULE_CLASS := STATIC_LIBRARIES -LOCAL_MODULE := third_party_webrtc_modules_NetEq_gyp -LOCAL_MODULE_SUFFIX := .a -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) -gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) -gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) - -# Make sure our deps are built first. -GYP_TARGET_DEPENDENCIES := - -GYP_GENERATED_OUTPUTS := - -# Make sure our deps and generated files are built first. -LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS) - -LOCAL_GENERATED_SOURCES := - -GYP_COPIED_SOURCE_ORIGIN_DIRS := - -LOCAL_SRC_FILES := \ - third_party/webrtc/modules/audio_coding/neteq/accelerate.c \ - third_party/webrtc/modules/audio_coding/neteq/automode.c \ - third_party/webrtc/modules/audio_coding/neteq/bgn_update.c \ - third_party/webrtc/modules/audio_coding/neteq/bufstats_decision.c \ - third_party/webrtc/modules/audio_coding/neteq/cng_internal.c \ - third_party/webrtc/modules/audio_coding/neteq/codec_db.c \ - third_party/webrtc/modules/audio_coding/neteq/correlator.c \ - third_party/webrtc/modules/audio_coding/neteq/dsp.c \ - third_party/webrtc/modules/audio_coding/neteq/dsp_helpfunctions.c \ - third_party/webrtc/modules/audio_coding/neteq/dtmf_buffer.c \ - third_party/webrtc/modules/audio_coding/neteq/dtmf_tonegen.c \ - third_party/webrtc/modules/audio_coding/neteq/expand.c \ - third_party/webrtc/modules/audio_coding/neteq/mcu_address_init.c \ - third_party/webrtc/modules/audio_coding/neteq/mcu_dsp_common.c \ - third_party/webrtc/modules/audio_coding/neteq/mcu_reset.c \ - third_party/webrtc/modules/audio_coding/neteq/merge.c \ - third_party/webrtc/modules/audio_coding/neteq/min_distortion.c \ - third_party/webrtc/modules/audio_coding/neteq/mix_voice_unvoice.c \ - third_party/webrtc/modules/audio_coding/neteq/mute_signal.c \ - third_party/webrtc/modules/audio_coding/neteq/normal.c \ - third_party/webrtc/modules/audio_coding/neteq/packet_buffer.c \ - third_party/webrtc/modules/audio_coding/neteq/peak_detection.c \ - third_party/webrtc/modules/audio_coding/neteq/preemptive_expand.c \ - third_party/webrtc/modules/audio_coding/neteq/random_vector.c \ - third_party/webrtc/modules/audio_coding/neteq/recin.c \ - third_party/webrtc/modules/audio_coding/neteq/recout.c \ - third_party/webrtc/modules/audio_coding/neteq/rtcp.c \ - third_party/webrtc/modules/audio_coding/neteq/rtp.c \ - third_party/webrtc/modules/audio_coding/neteq/set_fs.c \ - third_party/webrtc/modules/audio_coding/neteq/signal_mcu.c \ - third_party/webrtc/modules/audio_coding/neteq/split_and_insert.c \ - third_party/webrtc/modules/audio_coding/neteq/unmute_signal.c \ - third_party/webrtc/modules/audio_coding/neteq/webrtc_neteq.c - - -# Flags passed to both C and C++ files. -MY_CFLAGS_Debug := \ - -fstack-protector \ - --param=ssp-buffer-size=4 \ - -Werror \ - -fno-exceptions \ - -fno-strict-aliasing \ - -Wall \ - -Wno-unused-parameter \ - -Wno-missing-field-initializers \ - -fvisibility=hidden \ - -pipe \ - -fPIC \ - -Wno-unused-local-typedefs \ - -fno-builtin-cos \ - -fno-builtin-sin \ - -fno-builtin-cosf \ - -fno-builtin-sinf \ - -fno-builtin-cos \ - -fno-builtin-sin \ - -fno-builtin-cosf \ - -fno-builtin-sinf \ - -m64 \ - -march=x86-64 \ - -fuse-ld=gold \ - -ffunction-sections \ - -funwind-tables \ - -g \ - -fstack-protector \ - -fno-short-enums \ - -finline-limit=64 \ - -Wa,--noexecstack \ - -U_FORTIFY_SOURCE \ - -Wno-extra \ - -Wno-ignored-qualifiers \ - -Wno-type-limits \ - -Wno-unused-but-set-variable \ - -Os \ - -g \ - -fomit-frame-pointer \ - -fdata-sections \ - -ffunction-sections \ - -funwind-tables - -MY_DEFS_Debug := \ - '-DV8_DEPRECATION_WARNINGS' \ - '-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \ - '-D_FILE_OFFSET_BITS=64' \ - '-DNO_TCMALLOC' \ - '-DDISABLE_NACL' \ - '-DCHROMIUM_BUILD' \ - '-DUSE_LIBJPEG_TURBO=1' \ - '-DENABLE_WEBRTC=1' \ - '-DUSE_PROPRIETARY_CODECS' \ - '-DENABLE_CONFIGURATION_POLICY' \ - '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ - '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ - '-DENABLE_EGLIMAGE=1' \ - '-DCLD_VERSION=1' \ - '-DENABLE_PRINTING=1' \ - '-DENABLE_MANAGED_USERS=1' \ - '-DWEBRTC_RESTRICT_LOGGING' \ - '-DWEBRTC_MODULE_UTILITY_VIDEO' \ - '-DWEBRTC_CHROMIUM_BUILD' \ - '-DWEBRTC_POSIX' \ - '-DWEBRTC_LINUX' \ - '-DWEBRTC_ANDROID' \ - '-DWEBRTC_ANDROID_OPENSLES' \ - '-DNETEQ_VOICEENGINE_CODECS' \ - '-DSCRATCH' \ - '-DUSE_OPENSSL=1' \ - '-DUSE_OPENSSL_CERTS=1' \ - '-D__STDC_CONSTANT_MACROS' \ - '-D__STDC_FORMAT_MACROS' \ - '-DANDROID' \ - '-D__GNU_SOURCE=1' \ - '-DUSE_STLPORT=1' \ - '-D_STLP_USE_PTR_SPECIALIZATIONS=1' \ - '-DCHROME_BUILD_ID=""' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=1' \ - '-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \ - '-D_DEBUG' - - -# Include paths placed before CFLAGS/CPPFLAGS -LOCAL_C_INCLUDES_Debug := \ - $(LOCAL_PATH)/third_party \ - $(LOCAL_PATH) \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/neteq/interface \ - $(LOCAL_PATH)/third_party/webrtc \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/cng/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport - - -# Flags passed to only C++ (and not C) files. -LOCAL_CPPFLAGS_Debug := \ - -fno-rtti \ - -fno-threadsafe-statics \ - -fvisibility-inlines-hidden \ - -Wsign-compare \ - -Wno-non-virtual-dtor \ - -Wno-sign-promo - - -# Flags passed to both C and C++ files. -MY_CFLAGS_Release := \ - -fstack-protector \ - --param=ssp-buffer-size=4 \ - -Werror \ - -fno-exceptions \ - -fno-strict-aliasing \ - -Wall \ - -Wno-unused-parameter \ - -Wno-missing-field-initializers \ - -fvisibility=hidden \ - -pipe \ - -fPIC \ - -Wno-unused-local-typedefs \ - -fno-builtin-cos \ - -fno-builtin-sin \ - -fno-builtin-cosf \ - -fno-builtin-sinf \ - -fno-builtin-cos \ - -fno-builtin-sin \ - -fno-builtin-cosf \ - -fno-builtin-sinf \ - -m64 \ - -march=x86-64 \ - -fuse-ld=gold \ - -ffunction-sections \ - -funwind-tables \ - -g \ - -fstack-protector \ - -fno-short-enums \ - -finline-limit=64 \ - -Wa,--noexecstack \ - -U_FORTIFY_SOURCE \ - -Wno-extra \ - -Wno-ignored-qualifiers \ - -Wno-type-limits \ - -Wno-unused-but-set-variable \ - -Os \ - -fno-ident \ - -fdata-sections \ - -ffunction-sections \ - -fomit-frame-pointer \ - -funwind-tables - -MY_DEFS_Release := \ - '-DV8_DEPRECATION_WARNINGS' \ - '-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \ - '-D_FILE_OFFSET_BITS=64' \ - '-DNO_TCMALLOC' \ - '-DDISABLE_NACL' \ - '-DCHROMIUM_BUILD' \ - '-DUSE_LIBJPEG_TURBO=1' \ - '-DENABLE_WEBRTC=1' \ - '-DUSE_PROPRIETARY_CODECS' \ - '-DENABLE_CONFIGURATION_POLICY' \ - '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ - '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ - '-DENABLE_EGLIMAGE=1' \ - '-DCLD_VERSION=1' \ - '-DENABLE_PRINTING=1' \ - '-DENABLE_MANAGED_USERS=1' \ - '-DWEBRTC_RESTRICT_LOGGING' \ - '-DWEBRTC_MODULE_UTILITY_VIDEO' \ - '-DWEBRTC_CHROMIUM_BUILD' \ - '-DWEBRTC_POSIX' \ - '-DWEBRTC_LINUX' \ - '-DWEBRTC_ANDROID' \ - '-DWEBRTC_ANDROID_OPENSLES' \ - '-DNETEQ_VOICEENGINE_CODECS' \ - '-DSCRATCH' \ - '-DUSE_OPENSSL=1' \ - '-DUSE_OPENSSL_CERTS=1' \ - '-D__STDC_CONSTANT_MACROS' \ - '-D__STDC_FORMAT_MACROS' \ - '-DANDROID' \ - '-D__GNU_SOURCE=1' \ - '-DUSE_STLPORT=1' \ - '-D_STLP_USE_PTR_SPECIALIZATIONS=1' \ - '-DCHROME_BUILD_ID=""' \ - '-DNDEBUG' \ - '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-D_FORTIFY_SOURCE=2' - - -# Include paths placed before CFLAGS/CPPFLAGS -LOCAL_C_INCLUDES_Release := \ - $(LOCAL_PATH)/third_party \ - $(LOCAL_PATH) \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/neteq/interface \ - $(LOCAL_PATH)/third_party/webrtc \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/cng/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport - - -# Flags passed to only C++ (and not C) files. -LOCAL_CPPFLAGS_Release := \ - -fno-rtti \ - -fno-threadsafe-statics \ - -fvisibility-inlines-hidden \ - -Wsign-compare \ - -Wno-non-virtual-dtor \ - -Wno-sign-promo - - -LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) -LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) -LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) -LOCAL_ASFLAGS := $(LOCAL_CFLAGS) -### Rules for final target. - -LOCAL_LDFLAGS_Debug := \ - -Wl,-z,now \ - -Wl,-z,relro \ - -Wl,--fatal-warnings \ - -Wl,-z,noexecstack \ - -fPIC \ - -m64 \ - -fuse-ld=gold \ - -nostdlib \ - -Wl,--no-undefined \ - -Wl,--exclude-libs=ALL \ - -Wl,--warn-shared-textrel \ - -Wl,-O1 \ - -Wl,--as-needed - - -LOCAL_LDFLAGS_Release := \ - -Wl,-z,now \ - -Wl,-z,relro \ - -Wl,--fatal-warnings \ - -Wl,-z,noexecstack \ - -fPIC \ - -m64 \ - -fuse-ld=gold \ - -nostdlib \ - -Wl,--no-undefined \ - -Wl,--exclude-libs=ALL \ - -Wl,-O1 \ - -Wl,--as-needed \ - -Wl,--gc-sections \ - -Wl,--warn-shared-textrel - - -LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION)) - -LOCAL_STATIC_LIBRARIES := - -# Enable grouping to fix circular references -LOCAL_GROUP_STATIC_LIBRARIES := true - -LOCAL_SHARED_LIBRARIES := \ - libstlport \ - libdl - -# Add target alias to "gyp_all_modules" target. -.PHONY: gyp_all_modules -gyp_all_modules: third_party_webrtc_modules_NetEq_gyp - -# Alias gyp target name. -.PHONY: NetEq -NetEq: third_party_webrtc_modules_NetEq_gyp - -include $(BUILD_STATIC_LIBRARY) diff --git a/modules/acm2.target.darwin-arm.mk b/modules/acm2.target.darwin-arm.mk deleted file mode 100644 index 222798a4..00000000 --- a/modules/acm2.target.darwin-arm.mk +++ /dev/null @@ -1,366 +0,0 @@ -# This file is generated by gyp; do not edit. - -include $(CLEAR_VARS) - -LOCAL_MODULE_CLASS := STATIC_LIBRARIES -LOCAL_MODULE := third_party_webrtc_modules_acm2_gyp -LOCAL_MODULE_SUFFIX := .a -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) -gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) -gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) - -# Make sure our deps are built first. -GYP_TARGET_DEPENDENCIES := - -GYP_GENERATED_OUTPUTS := - -# Make sure our deps and generated files are built first. -LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS) - -LOCAL_CPP_EXTENSION := .cc -LOCAL_GENERATED_SOURCES := - -GYP_COPIED_SOURCE_ORIGIN_DIRS := - -LOCAL_SRC_FILES := \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_amr.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_amrwb.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_celt.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_cng.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_codec_database.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_dtmf_playout.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_g722.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_g7221.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_g7221c.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_g729.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_g7291.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_generic_codec.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_gsmfr.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_ilbc.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_isac.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_opus.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_speex.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_pcm16b.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_pcma.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_pcmu.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_red.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_receiver.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_resampler.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/audio_coding_module.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/call_statistics.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/initial_delay_manager.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/nack.cc - - -# Flags passed to both C and C++ files. -MY_CFLAGS_Debug := \ - -fstack-protector \ - --param=ssp-buffer-size=4 \ - -Werror \ - -fno-exceptions \ - -fno-strict-aliasing \ - -Wall \ - -Wno-unused-parameter \ - -Wno-missing-field-initializers \ - -fvisibility=hidden \ - -pipe \ - -fPIC \ - -fno-builtin-cos \ - -fno-builtin-sin \ - -fno-builtin-cosf \ - -fno-builtin-sinf \ - -fno-builtin-cos \ - -fno-builtin-sin \ - -fno-builtin-cosf \ - -fno-builtin-sinf \ - -fno-tree-sra \ - -fuse-ld=gold \ - -Wno-psabi \ - -ffunction-sections \ - -funwind-tables \ - -g \ - -fstack-protector \ - -fno-short-enums \ - -finline-limit=64 \ - -Wa,--noexecstack \ - -U_FORTIFY_SOURCE \ - -Wno-extra \ - -Wno-ignored-qualifiers \ - -Wno-type-limits \ - -Wno-unused-but-set-variable \ - -Os \ - -g \ - -fomit-frame-pointer \ - -fdata-sections \ - -ffunction-sections \ - -funwind-tables - -MY_DEFS_Debug := \ - '-DV8_DEPRECATION_WARNINGS' \ - '-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \ - '-D_FILE_OFFSET_BITS=64' \ - '-DNO_TCMALLOC' \ - '-DDISABLE_NACL' \ - '-DCHROMIUM_BUILD' \ - '-DUSE_LIBJPEG_TURBO=1' \ - '-DENABLE_WEBRTC=1' \ - '-DUSE_PROPRIETARY_CODECS' \ - '-DENABLE_CONFIGURATION_POLICY' \ - '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ - '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ - '-DENABLE_EGLIMAGE=1' \ - '-DCLD_VERSION=1' \ - '-DENABLE_PRINTING=1' \ - '-DENABLE_MANAGED_USERS=1' \ - '-DWEBRTC_RESTRICT_LOGGING' \ - '-DWEBRTC_MODULE_UTILITY_VIDEO' \ - '-DWEBRTC_CHROMIUM_BUILD' \ - '-DWEBRTC_ARCH_ARM' \ - '-DWEBRTC_ARCH_ARM_V7' \ - '-DWEBRTC_DETECT_ARM_NEON' \ - '-DWEBRTC_POSIX' \ - '-DWEBRTC_LINUX' \ - '-DWEBRTC_ANDROID' \ - '-DWEBRTC_ANDROID_OPENSLES' \ - '-DWEBRTC_CODEC_OPUS' \ - '-DUSE_OPENSSL=1' \ - '-DUSE_OPENSSL_CERTS=1' \ - '-D__STDC_CONSTANT_MACROS' \ - '-D__STDC_FORMAT_MACROS' \ - '-DANDROID' \ - '-D__GNU_SOURCE=1' \ - '-DUSE_STLPORT=1' \ - '-D_STLP_USE_PTR_SPECIALIZATIONS=1' \ - '-DCHROME_BUILD_ID=""' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=1' \ - '-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \ - '-D_DEBUG' - - -# Include paths placed before CFLAGS/CPPFLAGS -LOCAL_C_INCLUDES_Debug := \ - $(LOCAL_PATH)/third_party \ - $(LOCAL_PATH) \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/main/interface \ - $(LOCAL_PATH)/third_party/webrtc/modules/interface \ - $(LOCAL_PATH)/third_party/webrtc \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/cng/include \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/g711/include \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/g722/include \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/ilbc/interface \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/isac/main/interface \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/isac/fix/interface \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/pcm16b/include \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/neteq/interface \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ - $(LOCAL_PATH)/third_party/opus/src/celt \ - $(LOCAL_PATH)/third_party/opus/src/src \ - $(LOCAL_PATH)/third_party/opus/src/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport - - -# Flags passed to only C++ (and not C) files. -LOCAL_CPPFLAGS_Debug := \ - -fno-rtti \ - -fno-threadsafe-statics \ - -fvisibility-inlines-hidden \ - -Wsign-compare \ - -Wno-abi \ - -Wno-non-virtual-dtor \ - -Wno-sign-promo - - -# Flags passed to both C and C++ files. -MY_CFLAGS_Release := \ - -fstack-protector \ - --param=ssp-buffer-size=4 \ - -Werror \ - -fno-exceptions \ - -fno-strict-aliasing \ - -Wall \ - -Wno-unused-parameter \ - -Wno-missing-field-initializers \ - -fvisibility=hidden \ - -pipe \ - -fPIC \ - -fno-builtin-cos \ - -fno-builtin-sin \ - -fno-builtin-cosf \ - -fno-builtin-sinf \ - -fno-builtin-cos \ - -fno-builtin-sin \ - -fno-builtin-cosf \ - -fno-builtin-sinf \ - -fno-tree-sra \ - -fuse-ld=gold \ - -Wno-psabi \ - -ffunction-sections \ - -funwind-tables \ - -g \ - -fstack-protector \ - -fno-short-enums \ - -finline-limit=64 \ - -Wa,--noexecstack \ - -U_FORTIFY_SOURCE \ - -Wno-extra \ - -Wno-ignored-qualifiers \ - -Wno-type-limits \ - -Wno-unused-but-set-variable \ - -Os \ - -fno-ident \ - -fdata-sections \ - -ffunction-sections \ - -fomit-frame-pointer \ - -funwind-tables - -MY_DEFS_Release := \ - '-DV8_DEPRECATION_WARNINGS' \ - '-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \ - '-D_FILE_OFFSET_BITS=64' \ - '-DNO_TCMALLOC' \ - '-DDISABLE_NACL' \ - '-DCHROMIUM_BUILD' \ - '-DUSE_LIBJPEG_TURBO=1' \ - '-DENABLE_WEBRTC=1' \ - '-DUSE_PROPRIETARY_CODECS' \ - '-DENABLE_CONFIGURATION_POLICY' \ - '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ - '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ - '-DENABLE_EGLIMAGE=1' \ - '-DCLD_VERSION=1' \ - '-DENABLE_PRINTING=1' \ - '-DENABLE_MANAGED_USERS=1' \ - '-DWEBRTC_RESTRICT_LOGGING' \ - '-DWEBRTC_MODULE_UTILITY_VIDEO' \ - '-DWEBRTC_CHROMIUM_BUILD' \ - '-DWEBRTC_ARCH_ARM' \ - '-DWEBRTC_ARCH_ARM_V7' \ - '-DWEBRTC_DETECT_ARM_NEON' \ - '-DWEBRTC_POSIX' \ - '-DWEBRTC_LINUX' \ - '-DWEBRTC_ANDROID' \ - '-DWEBRTC_ANDROID_OPENSLES' \ - '-DWEBRTC_CODEC_OPUS' \ - '-DUSE_OPENSSL=1' \ - '-DUSE_OPENSSL_CERTS=1' \ - '-D__STDC_CONSTANT_MACROS' \ - '-D__STDC_FORMAT_MACROS' \ - '-DANDROID' \ - '-D__GNU_SOURCE=1' \ - '-DUSE_STLPORT=1' \ - '-D_STLP_USE_PTR_SPECIALIZATIONS=1' \ - '-DCHROME_BUILD_ID=""' \ - '-DNDEBUG' \ - '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-D_FORTIFY_SOURCE=2' - - -# Include paths placed before CFLAGS/CPPFLAGS -LOCAL_C_INCLUDES_Release := \ - $(LOCAL_PATH)/third_party \ - $(LOCAL_PATH) \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/main/interface \ - $(LOCAL_PATH)/third_party/webrtc/modules/interface \ - $(LOCAL_PATH)/third_party/webrtc \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/cng/include \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/g711/include \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/g722/include \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/ilbc/interface \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/isac/main/interface \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/isac/fix/interface \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/pcm16b/include \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/neteq/interface \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ - $(LOCAL_PATH)/third_party/opus/src/celt \ - $(LOCAL_PATH)/third_party/opus/src/src \ - $(LOCAL_PATH)/third_party/opus/src/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport - - -# Flags passed to only C++ (and not C) files. -LOCAL_CPPFLAGS_Release := \ - -fno-rtti \ - -fno-threadsafe-statics \ - -fvisibility-inlines-hidden \ - -Wsign-compare \ - -Wno-abi \ - -Wno-non-virtual-dtor \ - -Wno-sign-promo - - -LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) -LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) -LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) -LOCAL_ASFLAGS := $(LOCAL_CFLAGS) -### Rules for final target. - -LOCAL_LDFLAGS_Debug := \ - -Wl,-z,now \ - -Wl,-z,relro \ - -Wl,--fatal-warnings \ - -Wl,-z,noexecstack \ - -fPIC \ - -Wl,-z,relro \ - -Wl,-z,now \ - -fuse-ld=gold \ - -nostdlib \ - -Wl,--no-undefined \ - -Wl,--exclude-libs=ALL \ - -Wl,--icf=safe \ - -Wl,--warn-shared-textrel \ - -Wl,-O1 \ - -Wl,--as-needed - - -LOCAL_LDFLAGS_Release := \ - -Wl,-z,now \ - -Wl,-z,relro \ - -Wl,--fatal-warnings \ - -Wl,-z,noexecstack \ - -fPIC \ - -Wl,-z,relro \ - -Wl,-z,now \ - -fuse-ld=gold \ - -nostdlib \ - -Wl,--no-undefined \ - -Wl,--exclude-libs=ALL \ - -Wl,--icf=safe \ - -Wl,-O1 \ - -Wl,--as-needed \ - -Wl,--gc-sections \ - -Wl,--warn-shared-textrel - - -LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION)) - -LOCAL_STATIC_LIBRARIES := - -# Enable grouping to fix circular references -LOCAL_GROUP_STATIC_LIBRARIES := true - -LOCAL_SHARED_LIBRARIES := \ - libstlport \ - libdl - -# Add target alias to "gyp_all_modules" target. -.PHONY: gyp_all_modules -gyp_all_modules: third_party_webrtc_modules_acm2_gyp - -# Alias gyp target name. -.PHONY: acm2 -acm2: third_party_webrtc_modules_acm2_gyp - -include $(BUILD_STATIC_LIBRARY) diff --git a/modules/acm2.target.darwin-arm64.mk b/modules/acm2.target.darwin-arm64.mk deleted file mode 100644 index b27c7e7a..00000000 --- a/modules/acm2.target.darwin-arm64.mk +++ /dev/null @@ -1,342 +0,0 @@ -# This file is generated by gyp; do not edit. - -include $(CLEAR_VARS) - -LOCAL_MODULE_CLASS := STATIC_LIBRARIES -LOCAL_MODULE := third_party_webrtc_modules_acm2_gyp -LOCAL_MODULE_SUFFIX := .a -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) -gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) -gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) - -# Make sure our deps are built first. -GYP_TARGET_DEPENDENCIES := - -GYP_GENERATED_OUTPUTS := - -# Make sure our deps and generated files are built first. -LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS) - -LOCAL_CPP_EXTENSION := .cc -LOCAL_GENERATED_SOURCES := - -GYP_COPIED_SOURCE_ORIGIN_DIRS := - -LOCAL_SRC_FILES := \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_amr.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_amrwb.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_celt.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_cng.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_codec_database.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_dtmf_playout.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_g722.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_g7221.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_g7221c.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_g729.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_g7291.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_generic_codec.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_gsmfr.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_ilbc.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_isac.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_opus.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_speex.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_pcm16b.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_pcma.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_pcmu.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_red.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_receiver.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_resampler.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/audio_coding_module.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/call_statistics.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/initial_delay_manager.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/nack.cc - - -# Flags passed to both C and C++ files. -MY_CFLAGS_Debug := \ - --param=ssp-buffer-size=4 \ - -Werror \ - -fno-exceptions \ - -fno-strict-aliasing \ - -Wall \ - -Wno-unused-parameter \ - -Wno-missing-field-initializers \ - -fvisibility=hidden \ - -pipe \ - -fPIC \ - -Wno-unused-local-typedefs \ - -fno-builtin-cos \ - -fno-builtin-sin \ - -fno-builtin-cosf \ - -fno-builtin-sinf \ - -fno-builtin-cos \ - -fno-builtin-sin \ - -fno-builtin-cosf \ - -fno-builtin-sinf \ - -ffunction-sections \ - -funwind-tables \ - -g \ - -fno-short-enums \ - -finline-limit=64 \ - -Wa,--noexecstack \ - -U_FORTIFY_SOURCE \ - -Wno-extra \ - -Wno-ignored-qualifiers \ - -Wno-type-limits \ - -Wno-unused-but-set-variable \ - -Os \ - -g \ - -fomit-frame-pointer \ - -fdata-sections \ - -ffunction-sections \ - -funwind-tables - -MY_DEFS_Debug := \ - '-DV8_DEPRECATION_WARNINGS' \ - '-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \ - '-D_FILE_OFFSET_BITS=64' \ - '-DNO_TCMALLOC' \ - '-DDISABLE_NACL' \ - '-DCHROMIUM_BUILD' \ - '-DUSE_LIBJPEG_TURBO=1' \ - '-DENABLE_WEBRTC=1' \ - '-DUSE_PROPRIETARY_CODECS' \ - '-DENABLE_CONFIGURATION_POLICY' \ - '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ - '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ - '-DENABLE_EGLIMAGE=1' \ - '-DCLD_VERSION=1' \ - '-DENABLE_PRINTING=1' \ - '-DENABLE_MANAGED_USERS=1' \ - '-DWEBRTC_RESTRICT_LOGGING' \ - '-DWEBRTC_MODULE_UTILITY_VIDEO' \ - '-DWEBRTC_CHROMIUM_BUILD' \ - '-DWEBRTC_POSIX' \ - '-DWEBRTC_LINUX' \ - '-DWEBRTC_ANDROID' \ - '-DWEBRTC_ANDROID_OPENSLES' \ - '-DWEBRTC_CODEC_OPUS' \ - '-DUSE_OPENSSL=1' \ - '-DUSE_OPENSSL_CERTS=1' \ - '-D__STDC_CONSTANT_MACROS' \ - '-D__STDC_FORMAT_MACROS' \ - '-DANDROID' \ - '-D__GNU_SOURCE=1' \ - '-DUSE_STLPORT=1' \ - '-D_STLP_USE_PTR_SPECIALIZATIONS=1' \ - '-DCHROME_BUILD_ID=""' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=1' \ - '-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \ - '-D_DEBUG' - - -# Include paths placed before CFLAGS/CPPFLAGS -LOCAL_C_INCLUDES_Debug := \ - $(LOCAL_PATH)/third_party \ - $(LOCAL_PATH) \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/main/interface \ - $(LOCAL_PATH)/third_party/webrtc/modules/interface \ - $(LOCAL_PATH)/third_party/webrtc \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/cng/include \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/g711/include \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/g722/include \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/ilbc/interface \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/isac/main/interface \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/isac/fix/interface \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/pcm16b/include \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/neteq/interface \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ - $(LOCAL_PATH)/third_party/opus/src/celt \ - $(LOCAL_PATH)/third_party/opus/src/src \ - $(LOCAL_PATH)/third_party/opus/src/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport - - -# Flags passed to only C++ (and not C) files. -LOCAL_CPPFLAGS_Debug := \ - -fno-rtti \ - -fno-threadsafe-statics \ - -fvisibility-inlines-hidden \ - -Wsign-compare \ - -Wno-non-virtual-dtor \ - -Wno-sign-promo - - -# Flags passed to both C and C++ files. -MY_CFLAGS_Release := \ - --param=ssp-buffer-size=4 \ - -Werror \ - -fno-exceptions \ - -fno-strict-aliasing \ - -Wall \ - -Wno-unused-parameter \ - -Wno-missing-field-initializers \ - -fvisibility=hidden \ - -pipe \ - -fPIC \ - -Wno-unused-local-typedefs \ - -fno-builtin-cos \ - -fno-builtin-sin \ - -fno-builtin-cosf \ - -fno-builtin-sinf \ - -fno-builtin-cos \ - -fno-builtin-sin \ - -fno-builtin-cosf \ - -fno-builtin-sinf \ - -ffunction-sections \ - -funwind-tables \ - -g \ - -fno-short-enums \ - -finline-limit=64 \ - -Wa,--noexecstack \ - -U_FORTIFY_SOURCE \ - -Wno-extra \ - -Wno-ignored-qualifiers \ - -Wno-type-limits \ - -Wno-unused-but-set-variable \ - -Os \ - -fno-ident \ - -fdata-sections \ - -ffunction-sections \ - -fomit-frame-pointer \ - -funwind-tables - -MY_DEFS_Release := \ - '-DV8_DEPRECATION_WARNINGS' \ - '-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \ - '-D_FILE_OFFSET_BITS=64' \ - '-DNO_TCMALLOC' \ - '-DDISABLE_NACL' \ - '-DCHROMIUM_BUILD' \ - '-DUSE_LIBJPEG_TURBO=1' \ - '-DENABLE_WEBRTC=1' \ - '-DUSE_PROPRIETARY_CODECS' \ - '-DENABLE_CONFIGURATION_POLICY' \ - '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ - '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ - '-DENABLE_EGLIMAGE=1' \ - '-DCLD_VERSION=1' \ - '-DENABLE_PRINTING=1' \ - '-DENABLE_MANAGED_USERS=1' \ - '-DWEBRTC_RESTRICT_LOGGING' \ - '-DWEBRTC_MODULE_UTILITY_VIDEO' \ - '-DWEBRTC_CHROMIUM_BUILD' \ - '-DWEBRTC_POSIX' \ - '-DWEBRTC_LINUX' \ - '-DWEBRTC_ANDROID' \ - '-DWEBRTC_ANDROID_OPENSLES' \ - '-DWEBRTC_CODEC_OPUS' \ - '-DUSE_OPENSSL=1' \ - '-DUSE_OPENSSL_CERTS=1' \ - '-D__STDC_CONSTANT_MACROS' \ - '-D__STDC_FORMAT_MACROS' \ - '-DANDROID' \ - '-D__GNU_SOURCE=1' \ - '-DUSE_STLPORT=1' \ - '-D_STLP_USE_PTR_SPECIALIZATIONS=1' \ - '-DCHROME_BUILD_ID=""' \ - '-DNDEBUG' \ - '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-D_FORTIFY_SOURCE=2' - - -# Include paths placed before CFLAGS/CPPFLAGS -LOCAL_C_INCLUDES_Release := \ - $(LOCAL_PATH)/third_party \ - $(LOCAL_PATH) \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/main/interface \ - $(LOCAL_PATH)/third_party/webrtc/modules/interface \ - $(LOCAL_PATH)/third_party/webrtc \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/cng/include \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/g711/include \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/g722/include \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/ilbc/interface \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/isac/main/interface \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/isac/fix/interface \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/pcm16b/include \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/neteq/interface \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ - $(LOCAL_PATH)/third_party/opus/src/celt \ - $(LOCAL_PATH)/third_party/opus/src/src \ - $(LOCAL_PATH)/third_party/opus/src/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport - - -# Flags passed to only C++ (and not C) files. -LOCAL_CPPFLAGS_Release := \ - -fno-rtti \ - -fno-threadsafe-statics \ - -fvisibility-inlines-hidden \ - -Wsign-compare \ - -Wno-non-virtual-dtor \ - -Wno-sign-promo - - -LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) -LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) -LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) -LOCAL_ASFLAGS := $(LOCAL_CFLAGS) -### Rules for final target. - -LOCAL_LDFLAGS_Debug := \ - -Wl,-z,now \ - -Wl,-z,relro \ - -Wl,--fatal-warnings \ - -Wl,-z,noexecstack \ - -fPIC \ - -nostdlib \ - -Wl,--no-undefined \ - -Wl,--exclude-libs=ALL \ - -Wl,--warn-shared-textrel \ - -Wl,-O1 \ - -Wl,--as-needed - - -LOCAL_LDFLAGS_Release := \ - -Wl,-z,now \ - -Wl,-z,relro \ - -Wl,--fatal-warnings \ - -Wl,-z,noexecstack \ - -fPIC \ - -nostdlib \ - -Wl,--no-undefined \ - -Wl,--exclude-libs=ALL \ - -Wl,-O1 \ - -Wl,--as-needed \ - -Wl,--gc-sections \ - -Wl,--warn-shared-textrel - - -LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION)) - -LOCAL_STATIC_LIBRARIES := - -# Enable grouping to fix circular references -LOCAL_GROUP_STATIC_LIBRARIES := true - -LOCAL_SHARED_LIBRARIES := \ - libstlport \ - libdl - -# Add target alias to "gyp_all_modules" target. -.PHONY: gyp_all_modules -gyp_all_modules: third_party_webrtc_modules_acm2_gyp - -# Alias gyp target name. -.PHONY: acm2 -acm2: third_party_webrtc_modules_acm2_gyp - -include $(BUILD_STATIC_LIBRARY) diff --git a/modules/acm2.target.darwin-mips.mk b/modules/acm2.target.darwin-mips.mk deleted file mode 100644 index 3c220bbc..00000000 --- a/modules/acm2.target.darwin-mips.mk +++ /dev/null @@ -1,362 +0,0 @@ -# This file is generated by gyp; do not edit. - -include $(CLEAR_VARS) - -LOCAL_MODULE_CLASS := STATIC_LIBRARIES -LOCAL_MODULE := third_party_webrtc_modules_acm2_gyp -LOCAL_MODULE_SUFFIX := .a -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) -gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) -gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) - -# Make sure our deps are built first. -GYP_TARGET_DEPENDENCIES := - -GYP_GENERATED_OUTPUTS := - -# Make sure our deps and generated files are built first. -LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS) - -LOCAL_CPP_EXTENSION := .cc -LOCAL_GENERATED_SOURCES := - -GYP_COPIED_SOURCE_ORIGIN_DIRS := - -LOCAL_SRC_FILES := \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_amr.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_amrwb.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_celt.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_cng.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_codec_database.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_dtmf_playout.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_g722.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_g7221.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_g7221c.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_g729.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_g7291.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_generic_codec.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_gsmfr.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_ilbc.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_isac.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_opus.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_speex.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_pcm16b.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_pcma.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_pcmu.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_red.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_receiver.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_resampler.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/audio_coding_module.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/call_statistics.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/initial_delay_manager.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/nack.cc - - -# Flags passed to both C and C++ files. -MY_CFLAGS_Debug := \ - -fstack-protector \ - --param=ssp-buffer-size=4 \ - \ - -fno-exceptions \ - -fno-strict-aliasing \ - -Wall \ - -Wno-unused-parameter \ - -Wno-missing-field-initializers \ - -fvisibility=hidden \ - -pipe \ - -fPIC \ - -mhard-float \ - -fno-builtin-cos \ - -fno-builtin-sin \ - -fno-builtin-cosf \ - -fno-builtin-sinf \ - -mhard-float \ - -fno-builtin-cos \ - -fno-builtin-sin \ - -fno-builtin-cosf \ - -fno-builtin-sinf \ - -EL \ - -mhard-float \ - -ffunction-sections \ - -funwind-tables \ - -g \ - -fstack-protector \ - -fno-short-enums \ - -finline-limit=64 \ - -Wa,--noexecstack \ - -U_FORTIFY_SOURCE \ - -Wno-extra \ - -Wno-ignored-qualifiers \ - -Wno-type-limits \ - -Wno-unused-but-set-variable \ - -Os \ - -g \ - -fomit-frame-pointer \ - -fdata-sections \ - -ffunction-sections \ - -funwind-tables - -MY_DEFS_Debug := \ - '-DV8_DEPRECATION_WARNINGS' \ - '-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \ - '-D_FILE_OFFSET_BITS=64' \ - '-DNO_TCMALLOC' \ - '-DDISABLE_NACL' \ - '-DCHROMIUM_BUILD' \ - '-DUSE_LIBJPEG_TURBO=1' \ - '-DENABLE_WEBRTC=1' \ - '-DUSE_PROPRIETARY_CODECS' \ - '-DENABLE_CONFIGURATION_POLICY' \ - '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ - '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ - '-DENABLE_EGLIMAGE=1' \ - '-DCLD_VERSION=1' \ - '-DENABLE_PRINTING=1' \ - '-DENABLE_MANAGED_USERS=1' \ - '-DWEBRTC_RESTRICT_LOGGING' \ - '-DWEBRTC_MODULE_UTILITY_VIDEO' \ - '-DWEBRTC_CHROMIUM_BUILD' \ - '-DMIPS32_LE' \ - '-DMIPS_FPU_LE' \ - '-DWEBRTC_POSIX' \ - '-DWEBRTC_LINUX' \ - '-DWEBRTC_ANDROID' \ - '-DWEBRTC_ANDROID_OPENSLES' \ - '-DWEBRTC_CODEC_OPUS' \ - '-DUSE_OPENSSL=1' \ - '-DUSE_OPENSSL_CERTS=1' \ - '-D__STDC_CONSTANT_MACROS' \ - '-D__STDC_FORMAT_MACROS' \ - '-DANDROID' \ - '-D__GNU_SOURCE=1' \ - '-DUSE_STLPORT=1' \ - '-D_STLP_USE_PTR_SPECIALIZATIONS=1' \ - '-DCHROME_BUILD_ID=""' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=1' \ - '-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \ - '-D_DEBUG' - - -# Include paths placed before CFLAGS/CPPFLAGS -LOCAL_C_INCLUDES_Debug := \ - $(LOCAL_PATH)/third_party \ - $(LOCAL_PATH) \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/main/interface \ - $(LOCAL_PATH)/third_party/webrtc/modules/interface \ - $(LOCAL_PATH)/third_party/webrtc \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/cng/include \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/g711/include \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/g722/include \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/ilbc/interface \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/isac/main/interface \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/isac/fix/interface \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/pcm16b/include \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/neteq/interface \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ - $(LOCAL_PATH)/third_party/opus/src/celt \ - $(LOCAL_PATH)/third_party/opus/src/src \ - $(LOCAL_PATH)/third_party/opus/src/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport - - -# Flags passed to only C++ (and not C) files. -LOCAL_CPPFLAGS_Debug := \ - -fno-rtti \ - -fno-threadsafe-statics \ - -fvisibility-inlines-hidden \ - -Wsign-compare \ - -Wno-uninitialized \ - -Wno-non-virtual-dtor \ - -Wno-sign-promo - - -# Flags passed to both C and C++ files. -MY_CFLAGS_Release := \ - -fstack-protector \ - --param=ssp-buffer-size=4 \ - \ - -fno-exceptions \ - -fno-strict-aliasing \ - -Wall \ - -Wno-unused-parameter \ - -Wno-missing-field-initializers \ - -fvisibility=hidden \ - -pipe \ - -fPIC \ - -mhard-float \ - -fno-builtin-cos \ - -fno-builtin-sin \ - -fno-builtin-cosf \ - -fno-builtin-sinf \ - -mhard-float \ - -fno-builtin-cos \ - -fno-builtin-sin \ - -fno-builtin-cosf \ - -fno-builtin-sinf \ - -EL \ - -mhard-float \ - -ffunction-sections \ - -funwind-tables \ - -g \ - -fstack-protector \ - -fno-short-enums \ - -finline-limit=64 \ - -Wa,--noexecstack \ - -U_FORTIFY_SOURCE \ - -Wno-extra \ - -Wno-ignored-qualifiers \ - -Wno-type-limits \ - -Wno-unused-but-set-variable \ - -Os \ - -fno-ident \ - -fdata-sections \ - -ffunction-sections \ - -fomit-frame-pointer \ - -funwind-tables - -MY_DEFS_Release := \ - '-DV8_DEPRECATION_WARNINGS' \ - '-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \ - '-D_FILE_OFFSET_BITS=64' \ - '-DNO_TCMALLOC' \ - '-DDISABLE_NACL' \ - '-DCHROMIUM_BUILD' \ - '-DUSE_LIBJPEG_TURBO=1' \ - '-DENABLE_WEBRTC=1' \ - '-DUSE_PROPRIETARY_CODECS' \ - '-DENABLE_CONFIGURATION_POLICY' \ - '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ - '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ - '-DENABLE_EGLIMAGE=1' \ - '-DCLD_VERSION=1' \ - '-DENABLE_PRINTING=1' \ - '-DENABLE_MANAGED_USERS=1' \ - '-DWEBRTC_RESTRICT_LOGGING' \ - '-DWEBRTC_MODULE_UTILITY_VIDEO' \ - '-DWEBRTC_CHROMIUM_BUILD' \ - '-DMIPS32_LE' \ - '-DMIPS_FPU_LE' \ - '-DWEBRTC_POSIX' \ - '-DWEBRTC_LINUX' \ - '-DWEBRTC_ANDROID' \ - '-DWEBRTC_ANDROID_OPENSLES' \ - '-DWEBRTC_CODEC_OPUS' \ - '-DUSE_OPENSSL=1' \ - '-DUSE_OPENSSL_CERTS=1' \ - '-D__STDC_CONSTANT_MACROS' \ - '-D__STDC_FORMAT_MACROS' \ - '-DANDROID' \ - '-D__GNU_SOURCE=1' \ - '-DUSE_STLPORT=1' \ - '-D_STLP_USE_PTR_SPECIALIZATIONS=1' \ - '-DCHROME_BUILD_ID=""' \ - '-DNDEBUG' \ - '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-D_FORTIFY_SOURCE=2' - - -# Include paths placed before CFLAGS/CPPFLAGS -LOCAL_C_INCLUDES_Release := \ - $(LOCAL_PATH)/third_party \ - $(LOCAL_PATH) \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/main/interface \ - $(LOCAL_PATH)/third_party/webrtc/modules/interface \ - $(LOCAL_PATH)/third_party/webrtc \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/cng/include \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/g711/include \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/g722/include \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/ilbc/interface \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/isac/main/interface \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/isac/fix/interface \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/pcm16b/include \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/neteq/interface \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ - $(LOCAL_PATH)/third_party/opus/src/celt \ - $(LOCAL_PATH)/third_party/opus/src/src \ - $(LOCAL_PATH)/third_party/opus/src/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport - - -# Flags passed to only C++ (and not C) files. -LOCAL_CPPFLAGS_Release := \ - -fno-rtti \ - -fno-threadsafe-statics \ - -fvisibility-inlines-hidden \ - -Wsign-compare \ - -Wno-uninitialized \ - -Wno-non-virtual-dtor \ - -Wno-sign-promo - - -LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) -LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) -LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) -LOCAL_ASFLAGS := $(LOCAL_CFLAGS) -### Rules for final target. - -LOCAL_LDFLAGS_Debug := \ - -Wl,-z,now \ - -Wl,-z,relro \ - -Wl,--fatal-warnings \ - -Wl,-z,noexecstack \ - -fPIC \ - -EL \ - -Wl,--no-keep-memory \ - -nostdlib \ - -Wl,--no-undefined \ - -Wl,--exclude-libs=ALL \ - -Wl,--warn-shared-textrel \ - -Wl,-O1 \ - -Wl,--as-needed - - -LOCAL_LDFLAGS_Release := \ - -Wl,-z,now \ - -Wl,-z,relro \ - -Wl,--fatal-warnings \ - -Wl,-z,noexecstack \ - -fPIC \ - -EL \ - -Wl,--no-keep-memory \ - -nostdlib \ - -Wl,--no-undefined \ - -Wl,--exclude-libs=ALL \ - -Wl,-O1 \ - -Wl,--as-needed \ - -Wl,--gc-sections \ - -Wl,--warn-shared-textrel - - -LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION)) - -LOCAL_STATIC_LIBRARIES := - -# Enable grouping to fix circular references -LOCAL_GROUP_STATIC_LIBRARIES := true - -LOCAL_SHARED_LIBRARIES := \ - libstlport \ - libdl - -# Add target alias to "gyp_all_modules" target. -.PHONY: gyp_all_modules -gyp_all_modules: third_party_webrtc_modules_acm2_gyp - -# Alias gyp target name. -.PHONY: acm2 -acm2: third_party_webrtc_modules_acm2_gyp - -include $(BUILD_STATIC_LIBRARY) diff --git a/modules/acm2.target.darwin-x86.mk b/modules/acm2.target.darwin-x86.mk deleted file mode 100644 index 94be33a5..00000000 --- a/modules/acm2.target.darwin-x86.mk +++ /dev/null @@ -1,356 +0,0 @@ -# This file is generated by gyp; do not edit. - -include $(CLEAR_VARS) - -LOCAL_MODULE_CLASS := STATIC_LIBRARIES -LOCAL_MODULE := third_party_webrtc_modules_acm2_gyp -LOCAL_MODULE_SUFFIX := .a -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) -gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) -gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) - -# Make sure our deps are built first. -GYP_TARGET_DEPENDENCIES := - -GYP_GENERATED_OUTPUTS := - -# Make sure our deps and generated files are built first. -LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS) - -LOCAL_CPP_EXTENSION := .cc -LOCAL_GENERATED_SOURCES := - -GYP_COPIED_SOURCE_ORIGIN_DIRS := - -LOCAL_SRC_FILES := \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_amr.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_amrwb.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_celt.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_cng.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_codec_database.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_dtmf_playout.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_g722.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_g7221.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_g7221c.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_g729.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_g7291.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_generic_codec.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_gsmfr.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_ilbc.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_isac.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_opus.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_speex.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_pcm16b.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_pcma.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_pcmu.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_red.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_receiver.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_resampler.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/audio_coding_module.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/call_statistics.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/initial_delay_manager.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/nack.cc - - -# Flags passed to both C and C++ files. -MY_CFLAGS_Debug := \ - --param=ssp-buffer-size=4 \ - -Werror \ - -fno-exceptions \ - -fno-strict-aliasing \ - -Wall \ - -Wno-unused-parameter \ - -Wno-missing-field-initializers \ - -fvisibility=hidden \ - -pipe \ - -fPIC \ - -fno-builtin-cos \ - -fno-builtin-sin \ - -fno-builtin-cosf \ - -fno-builtin-sinf \ - -fno-builtin-cos \ - -fno-builtin-sin \ - -fno-builtin-cosf \ - -fno-builtin-sinf \ - -msse2 \ - -mfpmath=sse \ - -mmmx \ - -m32 \ - -fuse-ld=gold \ - -ffunction-sections \ - -funwind-tables \ - -g \ - -fno-short-enums \ - -finline-limit=64 \ - -Wa,--noexecstack \ - -U_FORTIFY_SOURCE \ - -Wno-extra \ - -Wno-ignored-qualifiers \ - -Wno-type-limits \ - -Wno-unused-but-set-variable \ - -fno-stack-protector \ - -Os \ - -g \ - -fomit-frame-pointer \ - -fdata-sections \ - -ffunction-sections \ - -funwind-tables - -MY_DEFS_Debug := \ - '-DV8_DEPRECATION_WARNINGS' \ - '-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \ - '-D_FILE_OFFSET_BITS=64' \ - '-DNO_TCMALLOC' \ - '-DDISABLE_NACL' \ - '-DCHROMIUM_BUILD' \ - '-DUSE_LIBJPEG_TURBO=1' \ - '-DENABLE_WEBRTC=1' \ - '-DUSE_PROPRIETARY_CODECS' \ - '-DENABLE_CONFIGURATION_POLICY' \ - '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ - '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ - '-DENABLE_EGLIMAGE=1' \ - '-DCLD_VERSION=1' \ - '-DENABLE_PRINTING=1' \ - '-DENABLE_MANAGED_USERS=1' \ - '-DWEBRTC_RESTRICT_LOGGING' \ - '-DWEBRTC_MODULE_UTILITY_VIDEO' \ - '-DWEBRTC_CHROMIUM_BUILD' \ - '-DWEBRTC_POSIX' \ - '-DWEBRTC_LINUX' \ - '-DWEBRTC_ANDROID' \ - '-DWEBRTC_ANDROID_OPENSLES' \ - '-DWEBRTC_CODEC_OPUS' \ - '-DUSE_OPENSSL=1' \ - '-DUSE_OPENSSL_CERTS=1' \ - '-D__STDC_CONSTANT_MACROS' \ - '-D__STDC_FORMAT_MACROS' \ - '-DANDROID' \ - '-D__GNU_SOURCE=1' \ - '-DUSE_STLPORT=1' \ - '-D_STLP_USE_PTR_SPECIALIZATIONS=1' \ - '-DCHROME_BUILD_ID=""' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=1' \ - '-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \ - '-D_DEBUG' - - -# Include paths placed before CFLAGS/CPPFLAGS -LOCAL_C_INCLUDES_Debug := \ - $(LOCAL_PATH)/third_party \ - $(LOCAL_PATH) \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/main/interface \ - $(LOCAL_PATH)/third_party/webrtc/modules/interface \ - $(LOCAL_PATH)/third_party/webrtc \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/cng/include \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/g711/include \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/g722/include \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/ilbc/interface \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/isac/main/interface \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/isac/fix/interface \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/pcm16b/include \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/neteq/interface \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ - $(LOCAL_PATH)/third_party/opus/src/celt \ - $(LOCAL_PATH)/third_party/opus/src/src \ - $(LOCAL_PATH)/third_party/opus/src/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport - - -# Flags passed to only C++ (and not C) files. -LOCAL_CPPFLAGS_Debug := \ - -fno-rtti \ - -fno-threadsafe-statics \ - -fvisibility-inlines-hidden \ - -Wsign-compare \ - -Wno-non-virtual-dtor \ - -Wno-sign-promo - - -# Flags passed to both C and C++ files. -MY_CFLAGS_Release := \ - --param=ssp-buffer-size=4 \ - -Werror \ - -fno-exceptions \ - -fno-strict-aliasing \ - -Wall \ - -Wno-unused-parameter \ - -Wno-missing-field-initializers \ - -fvisibility=hidden \ - -pipe \ - -fPIC \ - -fno-builtin-cos \ - -fno-builtin-sin \ - -fno-builtin-cosf \ - -fno-builtin-sinf \ - -fno-builtin-cos \ - -fno-builtin-sin \ - -fno-builtin-cosf \ - -fno-builtin-sinf \ - -msse2 \ - -mfpmath=sse \ - -mmmx \ - -m32 \ - -fuse-ld=gold \ - -ffunction-sections \ - -funwind-tables \ - -g \ - -fno-short-enums \ - -finline-limit=64 \ - -Wa,--noexecstack \ - -U_FORTIFY_SOURCE \ - -Wno-extra \ - -Wno-ignored-qualifiers \ - -Wno-type-limits \ - -Wno-unused-but-set-variable \ - -fno-stack-protector \ - -Os \ - -fno-ident \ - -fdata-sections \ - -ffunction-sections \ - -fomit-frame-pointer \ - -funwind-tables - -MY_DEFS_Release := \ - '-DV8_DEPRECATION_WARNINGS' \ - '-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \ - '-D_FILE_OFFSET_BITS=64' \ - '-DNO_TCMALLOC' \ - '-DDISABLE_NACL' \ - '-DCHROMIUM_BUILD' \ - '-DUSE_LIBJPEG_TURBO=1' \ - '-DENABLE_WEBRTC=1' \ - '-DUSE_PROPRIETARY_CODECS' \ - '-DENABLE_CONFIGURATION_POLICY' \ - '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ - '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ - '-DENABLE_EGLIMAGE=1' \ - '-DCLD_VERSION=1' \ - '-DENABLE_PRINTING=1' \ - '-DENABLE_MANAGED_USERS=1' \ - '-DWEBRTC_RESTRICT_LOGGING' \ - '-DWEBRTC_MODULE_UTILITY_VIDEO' \ - '-DWEBRTC_CHROMIUM_BUILD' \ - '-DWEBRTC_POSIX' \ - '-DWEBRTC_LINUX' \ - '-DWEBRTC_ANDROID' \ - '-DWEBRTC_ANDROID_OPENSLES' \ - '-DWEBRTC_CODEC_OPUS' \ - '-DUSE_OPENSSL=1' \ - '-DUSE_OPENSSL_CERTS=1' \ - '-D__STDC_CONSTANT_MACROS' \ - '-D__STDC_FORMAT_MACROS' \ - '-DANDROID' \ - '-D__GNU_SOURCE=1' \ - '-DUSE_STLPORT=1' \ - '-D_STLP_USE_PTR_SPECIALIZATIONS=1' \ - '-DCHROME_BUILD_ID=""' \ - '-DNDEBUG' \ - '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-D_FORTIFY_SOURCE=2' - - -# Include paths placed before CFLAGS/CPPFLAGS -LOCAL_C_INCLUDES_Release := \ - $(LOCAL_PATH)/third_party \ - $(LOCAL_PATH) \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/main/interface \ - $(LOCAL_PATH)/third_party/webrtc/modules/interface \ - $(LOCAL_PATH)/third_party/webrtc \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/cng/include \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/g711/include \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/g722/include \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/ilbc/interface \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/isac/main/interface \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/isac/fix/interface \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/pcm16b/include \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/neteq/interface \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ - $(LOCAL_PATH)/third_party/opus/src/celt \ - $(LOCAL_PATH)/third_party/opus/src/src \ - $(LOCAL_PATH)/third_party/opus/src/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport - - -# Flags passed to only C++ (and not C) files. -LOCAL_CPPFLAGS_Release := \ - -fno-rtti \ - -fno-threadsafe-statics \ - -fvisibility-inlines-hidden \ - -Wsign-compare \ - -Wno-non-virtual-dtor \ - -Wno-sign-promo - - -LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) -LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) -LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) -LOCAL_ASFLAGS := $(LOCAL_CFLAGS) -### Rules for final target. - -LOCAL_LDFLAGS_Debug := \ - -Wl,-z,now \ - -Wl,-z,relro \ - -Wl,--fatal-warnings \ - -Wl,-z,noexecstack \ - -fPIC \ - -m32 \ - -fuse-ld=gold \ - -nostdlib \ - -Wl,--no-undefined \ - -Wl,--exclude-libs=ALL \ - -Wl,--warn-shared-textrel \ - -Wl,-O1 \ - -Wl,--as-needed - - -LOCAL_LDFLAGS_Release := \ - -Wl,-z,now \ - -Wl,-z,relro \ - -Wl,--fatal-warnings \ - -Wl,-z,noexecstack \ - -fPIC \ - -m32 \ - -fuse-ld=gold \ - -nostdlib \ - -Wl,--no-undefined \ - -Wl,--exclude-libs=ALL \ - -Wl,-O1 \ - -Wl,--as-needed \ - -Wl,--gc-sections \ - -Wl,--warn-shared-textrel - - -LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION)) - -LOCAL_STATIC_LIBRARIES := - -# Enable grouping to fix circular references -LOCAL_GROUP_STATIC_LIBRARIES := true - -LOCAL_SHARED_LIBRARIES := \ - libstlport \ - libdl - -# Add target alias to "gyp_all_modules" target. -.PHONY: gyp_all_modules -gyp_all_modules: third_party_webrtc_modules_acm2_gyp - -# Alias gyp target name. -.PHONY: acm2 -acm2: third_party_webrtc_modules_acm2_gyp - -include $(BUILD_STATIC_LIBRARY) diff --git a/modules/acm2.target.darwin-x86_64.mk b/modules/acm2.target.darwin-x86_64.mk deleted file mode 100644 index e2c8787b..00000000 --- a/modules/acm2.target.darwin-x86_64.mk +++ /dev/null @@ -1,356 +0,0 @@ -# This file is generated by gyp; do not edit. - -include $(CLEAR_VARS) - -LOCAL_MODULE_CLASS := STATIC_LIBRARIES -LOCAL_MODULE := third_party_webrtc_modules_acm2_gyp -LOCAL_MODULE_SUFFIX := .a -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) -gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) -gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) - -# Make sure our deps are built first. -GYP_TARGET_DEPENDENCIES := - -GYP_GENERATED_OUTPUTS := - -# Make sure our deps and generated files are built first. -LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS) - -LOCAL_CPP_EXTENSION := .cc -LOCAL_GENERATED_SOURCES := - -GYP_COPIED_SOURCE_ORIGIN_DIRS := - -LOCAL_SRC_FILES := \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_amr.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_amrwb.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_celt.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_cng.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_codec_database.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_dtmf_playout.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_g722.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_g7221.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_g7221c.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_g729.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_g7291.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_generic_codec.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_gsmfr.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_ilbc.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_isac.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_opus.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_speex.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_pcm16b.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_pcma.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_pcmu.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_red.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_receiver.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_resampler.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/audio_coding_module.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/call_statistics.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/initial_delay_manager.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/nack.cc - - -# Flags passed to both C and C++ files. -MY_CFLAGS_Debug := \ - -fstack-protector \ - --param=ssp-buffer-size=4 \ - -Werror \ - -fno-exceptions \ - -fno-strict-aliasing \ - -Wall \ - -Wno-unused-parameter \ - -Wno-missing-field-initializers \ - -fvisibility=hidden \ - -pipe \ - -fPIC \ - -Wno-unused-local-typedefs \ - -fno-builtin-cos \ - -fno-builtin-sin \ - -fno-builtin-cosf \ - -fno-builtin-sinf \ - -fno-builtin-cos \ - -fno-builtin-sin \ - -fno-builtin-cosf \ - -fno-builtin-sinf \ - -m64 \ - -march=x86-64 \ - -fuse-ld=gold \ - -ffunction-sections \ - -funwind-tables \ - -g \ - -fstack-protector \ - -fno-short-enums \ - -finline-limit=64 \ - -Wa,--noexecstack \ - -U_FORTIFY_SOURCE \ - -Wno-extra \ - -Wno-ignored-qualifiers \ - -Wno-type-limits \ - -Wno-unused-but-set-variable \ - -Os \ - -g \ - -fomit-frame-pointer \ - -fdata-sections \ - -ffunction-sections \ - -funwind-tables - -MY_DEFS_Debug := \ - '-DV8_DEPRECATION_WARNINGS' \ - '-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \ - '-D_FILE_OFFSET_BITS=64' \ - '-DNO_TCMALLOC' \ - '-DDISABLE_NACL' \ - '-DCHROMIUM_BUILD' \ - '-DUSE_LIBJPEG_TURBO=1' \ - '-DENABLE_WEBRTC=1' \ - '-DUSE_PROPRIETARY_CODECS' \ - '-DENABLE_CONFIGURATION_POLICY' \ - '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ - '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ - '-DENABLE_EGLIMAGE=1' \ - '-DCLD_VERSION=1' \ - '-DENABLE_PRINTING=1' \ - '-DENABLE_MANAGED_USERS=1' \ - '-DWEBRTC_RESTRICT_LOGGING' \ - '-DWEBRTC_MODULE_UTILITY_VIDEO' \ - '-DWEBRTC_CHROMIUM_BUILD' \ - '-DWEBRTC_POSIX' \ - '-DWEBRTC_LINUX' \ - '-DWEBRTC_ANDROID' \ - '-DWEBRTC_ANDROID_OPENSLES' \ - '-DWEBRTC_CODEC_OPUS' \ - '-DUSE_OPENSSL=1' \ - '-DUSE_OPENSSL_CERTS=1' \ - '-D__STDC_CONSTANT_MACROS' \ - '-D__STDC_FORMAT_MACROS' \ - '-DANDROID' \ - '-D__GNU_SOURCE=1' \ - '-DUSE_STLPORT=1' \ - '-D_STLP_USE_PTR_SPECIALIZATIONS=1' \ - '-DCHROME_BUILD_ID=""' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=1' \ - '-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \ - '-D_DEBUG' - - -# Include paths placed before CFLAGS/CPPFLAGS -LOCAL_C_INCLUDES_Debug := \ - $(LOCAL_PATH)/third_party \ - $(LOCAL_PATH) \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/main/interface \ - $(LOCAL_PATH)/third_party/webrtc/modules/interface \ - $(LOCAL_PATH)/third_party/webrtc \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/cng/include \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/g711/include \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/g722/include \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/ilbc/interface \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/isac/main/interface \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/isac/fix/interface \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/pcm16b/include \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/neteq/interface \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ - $(LOCAL_PATH)/third_party/opus/src/celt \ - $(LOCAL_PATH)/third_party/opus/src/src \ - $(LOCAL_PATH)/third_party/opus/src/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport - - -# Flags passed to only C++ (and not C) files. -LOCAL_CPPFLAGS_Debug := \ - -fno-rtti \ - -fno-threadsafe-statics \ - -fvisibility-inlines-hidden \ - -Wsign-compare \ - -Wno-non-virtual-dtor \ - -Wno-sign-promo - - -# Flags passed to both C and C++ files. -MY_CFLAGS_Release := \ - -fstack-protector \ - --param=ssp-buffer-size=4 \ - -Werror \ - -fno-exceptions \ - -fno-strict-aliasing \ - -Wall \ - -Wno-unused-parameter \ - -Wno-missing-field-initializers \ - -fvisibility=hidden \ - -pipe \ - -fPIC \ - -Wno-unused-local-typedefs \ - -fno-builtin-cos \ - -fno-builtin-sin \ - -fno-builtin-cosf \ - -fno-builtin-sinf \ - -fno-builtin-cos \ - -fno-builtin-sin \ - -fno-builtin-cosf \ - -fno-builtin-sinf \ - -m64 \ - -march=x86-64 \ - -fuse-ld=gold \ - -ffunction-sections \ - -funwind-tables \ - -g \ - -fstack-protector \ - -fno-short-enums \ - -finline-limit=64 \ - -Wa,--noexecstack \ - -U_FORTIFY_SOURCE \ - -Wno-extra \ - -Wno-ignored-qualifiers \ - -Wno-type-limits \ - -Wno-unused-but-set-variable \ - -Os \ - -fno-ident \ - -fdata-sections \ - -ffunction-sections \ - -fomit-frame-pointer \ - -funwind-tables - -MY_DEFS_Release := \ - '-DV8_DEPRECATION_WARNINGS' \ - '-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \ - '-D_FILE_OFFSET_BITS=64' \ - '-DNO_TCMALLOC' \ - '-DDISABLE_NACL' \ - '-DCHROMIUM_BUILD' \ - '-DUSE_LIBJPEG_TURBO=1' \ - '-DENABLE_WEBRTC=1' \ - '-DUSE_PROPRIETARY_CODECS' \ - '-DENABLE_CONFIGURATION_POLICY' \ - '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ - '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ - '-DENABLE_EGLIMAGE=1' \ - '-DCLD_VERSION=1' \ - '-DENABLE_PRINTING=1' \ - '-DENABLE_MANAGED_USERS=1' \ - '-DWEBRTC_RESTRICT_LOGGING' \ - '-DWEBRTC_MODULE_UTILITY_VIDEO' \ - '-DWEBRTC_CHROMIUM_BUILD' \ - '-DWEBRTC_POSIX' \ - '-DWEBRTC_LINUX' \ - '-DWEBRTC_ANDROID' \ - '-DWEBRTC_ANDROID_OPENSLES' \ - '-DWEBRTC_CODEC_OPUS' \ - '-DUSE_OPENSSL=1' \ - '-DUSE_OPENSSL_CERTS=1' \ - '-D__STDC_CONSTANT_MACROS' \ - '-D__STDC_FORMAT_MACROS' \ - '-DANDROID' \ - '-D__GNU_SOURCE=1' \ - '-DUSE_STLPORT=1' \ - '-D_STLP_USE_PTR_SPECIALIZATIONS=1' \ - '-DCHROME_BUILD_ID=""' \ - '-DNDEBUG' \ - '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-D_FORTIFY_SOURCE=2' - - -# Include paths placed before CFLAGS/CPPFLAGS -LOCAL_C_INCLUDES_Release := \ - $(LOCAL_PATH)/third_party \ - $(LOCAL_PATH) \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/main/interface \ - $(LOCAL_PATH)/third_party/webrtc/modules/interface \ - $(LOCAL_PATH)/third_party/webrtc \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/cng/include \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/g711/include \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/g722/include \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/ilbc/interface \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/isac/main/interface \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/isac/fix/interface \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/pcm16b/include \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/neteq/interface \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ - $(LOCAL_PATH)/third_party/opus/src/celt \ - $(LOCAL_PATH)/third_party/opus/src/src \ - $(LOCAL_PATH)/third_party/opus/src/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport - - -# Flags passed to only C++ (and not C) files. -LOCAL_CPPFLAGS_Release := \ - -fno-rtti \ - -fno-threadsafe-statics \ - -fvisibility-inlines-hidden \ - -Wsign-compare \ - -Wno-non-virtual-dtor \ - -Wno-sign-promo - - -LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) -LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) -LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) -LOCAL_ASFLAGS := $(LOCAL_CFLAGS) -### Rules for final target. - -LOCAL_LDFLAGS_Debug := \ - -Wl,-z,now \ - -Wl,-z,relro \ - -Wl,--fatal-warnings \ - -Wl,-z,noexecstack \ - -fPIC \ - -m64 \ - -fuse-ld=gold \ - -nostdlib \ - -Wl,--no-undefined \ - -Wl,--exclude-libs=ALL \ - -Wl,--warn-shared-textrel \ - -Wl,-O1 \ - -Wl,--as-needed - - -LOCAL_LDFLAGS_Release := \ - -Wl,-z,now \ - -Wl,-z,relro \ - -Wl,--fatal-warnings \ - -Wl,-z,noexecstack \ - -fPIC \ - -m64 \ - -fuse-ld=gold \ - -nostdlib \ - -Wl,--no-undefined \ - -Wl,--exclude-libs=ALL \ - -Wl,-O1 \ - -Wl,--as-needed \ - -Wl,--gc-sections \ - -Wl,--warn-shared-textrel - - -LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION)) - -LOCAL_STATIC_LIBRARIES := - -# Enable grouping to fix circular references -LOCAL_GROUP_STATIC_LIBRARIES := true - -LOCAL_SHARED_LIBRARIES := \ - libstlport \ - libdl - -# Add target alias to "gyp_all_modules" target. -.PHONY: gyp_all_modules -gyp_all_modules: third_party_webrtc_modules_acm2_gyp - -# Alias gyp target name. -.PHONY: acm2 -acm2: third_party_webrtc_modules_acm2_gyp - -include $(BUILD_STATIC_LIBRARY) diff --git a/modules/acm2.target.linux-arm.mk b/modules/acm2.target.linux-arm.mk deleted file mode 100644 index 222798a4..00000000 --- a/modules/acm2.target.linux-arm.mk +++ /dev/null @@ -1,366 +0,0 @@ -# This file is generated by gyp; do not edit. - -include $(CLEAR_VARS) - -LOCAL_MODULE_CLASS := STATIC_LIBRARIES -LOCAL_MODULE := third_party_webrtc_modules_acm2_gyp -LOCAL_MODULE_SUFFIX := .a -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) -gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) -gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) - -# Make sure our deps are built first. -GYP_TARGET_DEPENDENCIES := - -GYP_GENERATED_OUTPUTS := - -# Make sure our deps and generated files are built first. -LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS) - -LOCAL_CPP_EXTENSION := .cc -LOCAL_GENERATED_SOURCES := - -GYP_COPIED_SOURCE_ORIGIN_DIRS := - -LOCAL_SRC_FILES := \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_amr.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_amrwb.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_celt.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_cng.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_codec_database.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_dtmf_playout.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_g722.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_g7221.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_g7221c.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_g729.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_g7291.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_generic_codec.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_gsmfr.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_ilbc.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_isac.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_opus.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_speex.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_pcm16b.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_pcma.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_pcmu.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_red.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_receiver.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_resampler.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/audio_coding_module.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/call_statistics.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/initial_delay_manager.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/nack.cc - - -# Flags passed to both C and C++ files. -MY_CFLAGS_Debug := \ - -fstack-protector \ - --param=ssp-buffer-size=4 \ - -Werror \ - -fno-exceptions \ - -fno-strict-aliasing \ - -Wall \ - -Wno-unused-parameter \ - -Wno-missing-field-initializers \ - -fvisibility=hidden \ - -pipe \ - -fPIC \ - -fno-builtin-cos \ - -fno-builtin-sin \ - -fno-builtin-cosf \ - -fno-builtin-sinf \ - -fno-builtin-cos \ - -fno-builtin-sin \ - -fno-builtin-cosf \ - -fno-builtin-sinf \ - -fno-tree-sra \ - -fuse-ld=gold \ - -Wno-psabi \ - -ffunction-sections \ - -funwind-tables \ - -g \ - -fstack-protector \ - -fno-short-enums \ - -finline-limit=64 \ - -Wa,--noexecstack \ - -U_FORTIFY_SOURCE \ - -Wno-extra \ - -Wno-ignored-qualifiers \ - -Wno-type-limits \ - -Wno-unused-but-set-variable \ - -Os \ - -g \ - -fomit-frame-pointer \ - -fdata-sections \ - -ffunction-sections \ - -funwind-tables - -MY_DEFS_Debug := \ - '-DV8_DEPRECATION_WARNINGS' \ - '-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \ - '-D_FILE_OFFSET_BITS=64' \ - '-DNO_TCMALLOC' \ - '-DDISABLE_NACL' \ - '-DCHROMIUM_BUILD' \ - '-DUSE_LIBJPEG_TURBO=1' \ - '-DENABLE_WEBRTC=1' \ - '-DUSE_PROPRIETARY_CODECS' \ - '-DENABLE_CONFIGURATION_POLICY' \ - '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ - '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ - '-DENABLE_EGLIMAGE=1' \ - '-DCLD_VERSION=1' \ - '-DENABLE_PRINTING=1' \ - '-DENABLE_MANAGED_USERS=1' \ - '-DWEBRTC_RESTRICT_LOGGING' \ - '-DWEBRTC_MODULE_UTILITY_VIDEO' \ - '-DWEBRTC_CHROMIUM_BUILD' \ - '-DWEBRTC_ARCH_ARM' \ - '-DWEBRTC_ARCH_ARM_V7' \ - '-DWEBRTC_DETECT_ARM_NEON' \ - '-DWEBRTC_POSIX' \ - '-DWEBRTC_LINUX' \ - '-DWEBRTC_ANDROID' \ - '-DWEBRTC_ANDROID_OPENSLES' \ - '-DWEBRTC_CODEC_OPUS' \ - '-DUSE_OPENSSL=1' \ - '-DUSE_OPENSSL_CERTS=1' \ - '-D__STDC_CONSTANT_MACROS' \ - '-D__STDC_FORMAT_MACROS' \ - '-DANDROID' \ - '-D__GNU_SOURCE=1' \ - '-DUSE_STLPORT=1' \ - '-D_STLP_USE_PTR_SPECIALIZATIONS=1' \ - '-DCHROME_BUILD_ID=""' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=1' \ - '-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \ - '-D_DEBUG' - - -# Include paths placed before CFLAGS/CPPFLAGS -LOCAL_C_INCLUDES_Debug := \ - $(LOCAL_PATH)/third_party \ - $(LOCAL_PATH) \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/main/interface \ - $(LOCAL_PATH)/third_party/webrtc/modules/interface \ - $(LOCAL_PATH)/third_party/webrtc \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/cng/include \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/g711/include \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/g722/include \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/ilbc/interface \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/isac/main/interface \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/isac/fix/interface \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/pcm16b/include \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/neteq/interface \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ - $(LOCAL_PATH)/third_party/opus/src/celt \ - $(LOCAL_PATH)/third_party/opus/src/src \ - $(LOCAL_PATH)/third_party/opus/src/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport - - -# Flags passed to only C++ (and not C) files. -LOCAL_CPPFLAGS_Debug := \ - -fno-rtti \ - -fno-threadsafe-statics \ - -fvisibility-inlines-hidden \ - -Wsign-compare \ - -Wno-abi \ - -Wno-non-virtual-dtor \ - -Wno-sign-promo - - -# Flags passed to both C and C++ files. -MY_CFLAGS_Release := \ - -fstack-protector \ - --param=ssp-buffer-size=4 \ - -Werror \ - -fno-exceptions \ - -fno-strict-aliasing \ - -Wall \ - -Wno-unused-parameter \ - -Wno-missing-field-initializers \ - -fvisibility=hidden \ - -pipe \ - -fPIC \ - -fno-builtin-cos \ - -fno-builtin-sin \ - -fno-builtin-cosf \ - -fno-builtin-sinf \ - -fno-builtin-cos \ - -fno-builtin-sin \ - -fno-builtin-cosf \ - -fno-builtin-sinf \ - -fno-tree-sra \ - -fuse-ld=gold \ - -Wno-psabi \ - -ffunction-sections \ - -funwind-tables \ - -g \ - -fstack-protector \ - -fno-short-enums \ - -finline-limit=64 \ - -Wa,--noexecstack \ - -U_FORTIFY_SOURCE \ - -Wno-extra \ - -Wno-ignored-qualifiers \ - -Wno-type-limits \ - -Wno-unused-but-set-variable \ - -Os \ - -fno-ident \ - -fdata-sections \ - -ffunction-sections \ - -fomit-frame-pointer \ - -funwind-tables - -MY_DEFS_Release := \ - '-DV8_DEPRECATION_WARNINGS' \ - '-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \ - '-D_FILE_OFFSET_BITS=64' \ - '-DNO_TCMALLOC' \ - '-DDISABLE_NACL' \ - '-DCHROMIUM_BUILD' \ - '-DUSE_LIBJPEG_TURBO=1' \ - '-DENABLE_WEBRTC=1' \ - '-DUSE_PROPRIETARY_CODECS' \ - '-DENABLE_CONFIGURATION_POLICY' \ - '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ - '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ - '-DENABLE_EGLIMAGE=1' \ - '-DCLD_VERSION=1' \ - '-DENABLE_PRINTING=1' \ - '-DENABLE_MANAGED_USERS=1' \ - '-DWEBRTC_RESTRICT_LOGGING' \ - '-DWEBRTC_MODULE_UTILITY_VIDEO' \ - '-DWEBRTC_CHROMIUM_BUILD' \ - '-DWEBRTC_ARCH_ARM' \ - '-DWEBRTC_ARCH_ARM_V7' \ - '-DWEBRTC_DETECT_ARM_NEON' \ - '-DWEBRTC_POSIX' \ - '-DWEBRTC_LINUX' \ - '-DWEBRTC_ANDROID' \ - '-DWEBRTC_ANDROID_OPENSLES' \ - '-DWEBRTC_CODEC_OPUS' \ - '-DUSE_OPENSSL=1' \ - '-DUSE_OPENSSL_CERTS=1' \ - '-D__STDC_CONSTANT_MACROS' \ - '-D__STDC_FORMAT_MACROS' \ - '-DANDROID' \ - '-D__GNU_SOURCE=1' \ - '-DUSE_STLPORT=1' \ - '-D_STLP_USE_PTR_SPECIALIZATIONS=1' \ - '-DCHROME_BUILD_ID=""' \ - '-DNDEBUG' \ - '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-D_FORTIFY_SOURCE=2' - - -# Include paths placed before CFLAGS/CPPFLAGS -LOCAL_C_INCLUDES_Release := \ - $(LOCAL_PATH)/third_party \ - $(LOCAL_PATH) \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/main/interface \ - $(LOCAL_PATH)/third_party/webrtc/modules/interface \ - $(LOCAL_PATH)/third_party/webrtc \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/cng/include \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/g711/include \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/g722/include \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/ilbc/interface \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/isac/main/interface \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/isac/fix/interface \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/pcm16b/include \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/neteq/interface \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ - $(LOCAL_PATH)/third_party/opus/src/celt \ - $(LOCAL_PATH)/third_party/opus/src/src \ - $(LOCAL_PATH)/third_party/opus/src/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport - - -# Flags passed to only C++ (and not C) files. -LOCAL_CPPFLAGS_Release := \ - -fno-rtti \ - -fno-threadsafe-statics \ - -fvisibility-inlines-hidden \ - -Wsign-compare \ - -Wno-abi \ - -Wno-non-virtual-dtor \ - -Wno-sign-promo - - -LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) -LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) -LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) -LOCAL_ASFLAGS := $(LOCAL_CFLAGS) -### Rules for final target. - -LOCAL_LDFLAGS_Debug := \ - -Wl,-z,now \ - -Wl,-z,relro \ - -Wl,--fatal-warnings \ - -Wl,-z,noexecstack \ - -fPIC \ - -Wl,-z,relro \ - -Wl,-z,now \ - -fuse-ld=gold \ - -nostdlib \ - -Wl,--no-undefined \ - -Wl,--exclude-libs=ALL \ - -Wl,--icf=safe \ - -Wl,--warn-shared-textrel \ - -Wl,-O1 \ - -Wl,--as-needed - - -LOCAL_LDFLAGS_Release := \ - -Wl,-z,now \ - -Wl,-z,relro \ - -Wl,--fatal-warnings \ - -Wl,-z,noexecstack \ - -fPIC \ - -Wl,-z,relro \ - -Wl,-z,now \ - -fuse-ld=gold \ - -nostdlib \ - -Wl,--no-undefined \ - -Wl,--exclude-libs=ALL \ - -Wl,--icf=safe \ - -Wl,-O1 \ - -Wl,--as-needed \ - -Wl,--gc-sections \ - -Wl,--warn-shared-textrel - - -LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION)) - -LOCAL_STATIC_LIBRARIES := - -# Enable grouping to fix circular references -LOCAL_GROUP_STATIC_LIBRARIES := true - -LOCAL_SHARED_LIBRARIES := \ - libstlport \ - libdl - -# Add target alias to "gyp_all_modules" target. -.PHONY: gyp_all_modules -gyp_all_modules: third_party_webrtc_modules_acm2_gyp - -# Alias gyp target name. -.PHONY: acm2 -acm2: third_party_webrtc_modules_acm2_gyp - -include $(BUILD_STATIC_LIBRARY) diff --git a/modules/acm2.target.linux-arm64.mk b/modules/acm2.target.linux-arm64.mk deleted file mode 100644 index b27c7e7a..00000000 --- a/modules/acm2.target.linux-arm64.mk +++ /dev/null @@ -1,342 +0,0 @@ -# This file is generated by gyp; do not edit. - -include $(CLEAR_VARS) - -LOCAL_MODULE_CLASS := STATIC_LIBRARIES -LOCAL_MODULE := third_party_webrtc_modules_acm2_gyp -LOCAL_MODULE_SUFFIX := .a -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) -gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) -gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) - -# Make sure our deps are built first. -GYP_TARGET_DEPENDENCIES := - -GYP_GENERATED_OUTPUTS := - -# Make sure our deps and generated files are built first. -LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS) - -LOCAL_CPP_EXTENSION := .cc -LOCAL_GENERATED_SOURCES := - -GYP_COPIED_SOURCE_ORIGIN_DIRS := - -LOCAL_SRC_FILES := \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_amr.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_amrwb.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_celt.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_cng.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_codec_database.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_dtmf_playout.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_g722.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_g7221.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_g7221c.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_g729.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_g7291.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_generic_codec.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_gsmfr.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_ilbc.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_isac.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_opus.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_speex.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_pcm16b.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_pcma.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_pcmu.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_red.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_receiver.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_resampler.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/audio_coding_module.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/call_statistics.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/initial_delay_manager.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/nack.cc - - -# Flags passed to both C and C++ files. -MY_CFLAGS_Debug := \ - --param=ssp-buffer-size=4 \ - -Werror \ - -fno-exceptions \ - -fno-strict-aliasing \ - -Wall \ - -Wno-unused-parameter \ - -Wno-missing-field-initializers \ - -fvisibility=hidden \ - -pipe \ - -fPIC \ - -Wno-unused-local-typedefs \ - -fno-builtin-cos \ - -fno-builtin-sin \ - -fno-builtin-cosf \ - -fno-builtin-sinf \ - -fno-builtin-cos \ - -fno-builtin-sin \ - -fno-builtin-cosf \ - -fno-builtin-sinf \ - -ffunction-sections \ - -funwind-tables \ - -g \ - -fno-short-enums \ - -finline-limit=64 \ - -Wa,--noexecstack \ - -U_FORTIFY_SOURCE \ - -Wno-extra \ - -Wno-ignored-qualifiers \ - -Wno-type-limits \ - -Wno-unused-but-set-variable \ - -Os \ - -g \ - -fomit-frame-pointer \ - -fdata-sections \ - -ffunction-sections \ - -funwind-tables - -MY_DEFS_Debug := \ - '-DV8_DEPRECATION_WARNINGS' \ - '-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \ - '-D_FILE_OFFSET_BITS=64' \ - '-DNO_TCMALLOC' \ - '-DDISABLE_NACL' \ - '-DCHROMIUM_BUILD' \ - '-DUSE_LIBJPEG_TURBO=1' \ - '-DENABLE_WEBRTC=1' \ - '-DUSE_PROPRIETARY_CODECS' \ - '-DENABLE_CONFIGURATION_POLICY' \ - '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ - '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ - '-DENABLE_EGLIMAGE=1' \ - '-DCLD_VERSION=1' \ - '-DENABLE_PRINTING=1' \ - '-DENABLE_MANAGED_USERS=1' \ - '-DWEBRTC_RESTRICT_LOGGING' \ - '-DWEBRTC_MODULE_UTILITY_VIDEO' \ - '-DWEBRTC_CHROMIUM_BUILD' \ - '-DWEBRTC_POSIX' \ - '-DWEBRTC_LINUX' \ - '-DWEBRTC_ANDROID' \ - '-DWEBRTC_ANDROID_OPENSLES' \ - '-DWEBRTC_CODEC_OPUS' \ - '-DUSE_OPENSSL=1' \ - '-DUSE_OPENSSL_CERTS=1' \ - '-D__STDC_CONSTANT_MACROS' \ - '-D__STDC_FORMAT_MACROS' \ - '-DANDROID' \ - '-D__GNU_SOURCE=1' \ - '-DUSE_STLPORT=1' \ - '-D_STLP_USE_PTR_SPECIALIZATIONS=1' \ - '-DCHROME_BUILD_ID=""' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=1' \ - '-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \ - '-D_DEBUG' - - -# Include paths placed before CFLAGS/CPPFLAGS -LOCAL_C_INCLUDES_Debug := \ - $(LOCAL_PATH)/third_party \ - $(LOCAL_PATH) \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/main/interface \ - $(LOCAL_PATH)/third_party/webrtc/modules/interface \ - $(LOCAL_PATH)/third_party/webrtc \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/cng/include \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/g711/include \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/g722/include \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/ilbc/interface \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/isac/main/interface \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/isac/fix/interface \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/pcm16b/include \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/neteq/interface \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ - $(LOCAL_PATH)/third_party/opus/src/celt \ - $(LOCAL_PATH)/third_party/opus/src/src \ - $(LOCAL_PATH)/third_party/opus/src/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport - - -# Flags passed to only C++ (and not C) files. -LOCAL_CPPFLAGS_Debug := \ - -fno-rtti \ - -fno-threadsafe-statics \ - -fvisibility-inlines-hidden \ - -Wsign-compare \ - -Wno-non-virtual-dtor \ - -Wno-sign-promo - - -# Flags passed to both C and C++ files. -MY_CFLAGS_Release := \ - --param=ssp-buffer-size=4 \ - -Werror \ - -fno-exceptions \ - -fno-strict-aliasing \ - -Wall \ - -Wno-unused-parameter \ - -Wno-missing-field-initializers \ - -fvisibility=hidden \ - -pipe \ - -fPIC \ - -Wno-unused-local-typedefs \ - -fno-builtin-cos \ - -fno-builtin-sin \ - -fno-builtin-cosf \ - -fno-builtin-sinf \ - -fno-builtin-cos \ - -fno-builtin-sin \ - -fno-builtin-cosf \ - -fno-builtin-sinf \ - -ffunction-sections \ - -funwind-tables \ - -g \ - -fno-short-enums \ - -finline-limit=64 \ - -Wa,--noexecstack \ - -U_FORTIFY_SOURCE \ - -Wno-extra \ - -Wno-ignored-qualifiers \ - -Wno-type-limits \ - -Wno-unused-but-set-variable \ - -Os \ - -fno-ident \ - -fdata-sections \ - -ffunction-sections \ - -fomit-frame-pointer \ - -funwind-tables - -MY_DEFS_Release := \ - '-DV8_DEPRECATION_WARNINGS' \ - '-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \ - '-D_FILE_OFFSET_BITS=64' \ - '-DNO_TCMALLOC' \ - '-DDISABLE_NACL' \ - '-DCHROMIUM_BUILD' \ - '-DUSE_LIBJPEG_TURBO=1' \ - '-DENABLE_WEBRTC=1' \ - '-DUSE_PROPRIETARY_CODECS' \ - '-DENABLE_CONFIGURATION_POLICY' \ - '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ - '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ - '-DENABLE_EGLIMAGE=1' \ - '-DCLD_VERSION=1' \ - '-DENABLE_PRINTING=1' \ - '-DENABLE_MANAGED_USERS=1' \ - '-DWEBRTC_RESTRICT_LOGGING' \ - '-DWEBRTC_MODULE_UTILITY_VIDEO' \ - '-DWEBRTC_CHROMIUM_BUILD' \ - '-DWEBRTC_POSIX' \ - '-DWEBRTC_LINUX' \ - '-DWEBRTC_ANDROID' \ - '-DWEBRTC_ANDROID_OPENSLES' \ - '-DWEBRTC_CODEC_OPUS' \ - '-DUSE_OPENSSL=1' \ - '-DUSE_OPENSSL_CERTS=1' \ - '-D__STDC_CONSTANT_MACROS' \ - '-D__STDC_FORMAT_MACROS' \ - '-DANDROID' \ - '-D__GNU_SOURCE=1' \ - '-DUSE_STLPORT=1' \ - '-D_STLP_USE_PTR_SPECIALIZATIONS=1' \ - '-DCHROME_BUILD_ID=""' \ - '-DNDEBUG' \ - '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-D_FORTIFY_SOURCE=2' - - -# Include paths placed before CFLAGS/CPPFLAGS -LOCAL_C_INCLUDES_Release := \ - $(LOCAL_PATH)/third_party \ - $(LOCAL_PATH) \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/main/interface \ - $(LOCAL_PATH)/third_party/webrtc/modules/interface \ - $(LOCAL_PATH)/third_party/webrtc \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/cng/include \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/g711/include \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/g722/include \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/ilbc/interface \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/isac/main/interface \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/isac/fix/interface \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/pcm16b/include \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/neteq/interface \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ - $(LOCAL_PATH)/third_party/opus/src/celt \ - $(LOCAL_PATH)/third_party/opus/src/src \ - $(LOCAL_PATH)/third_party/opus/src/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport - - -# Flags passed to only C++ (and not C) files. -LOCAL_CPPFLAGS_Release := \ - -fno-rtti \ - -fno-threadsafe-statics \ - -fvisibility-inlines-hidden \ - -Wsign-compare \ - -Wno-non-virtual-dtor \ - -Wno-sign-promo - - -LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) -LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) -LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) -LOCAL_ASFLAGS := $(LOCAL_CFLAGS) -### Rules for final target. - -LOCAL_LDFLAGS_Debug := \ - -Wl,-z,now \ - -Wl,-z,relro \ - -Wl,--fatal-warnings \ - -Wl,-z,noexecstack \ - -fPIC \ - -nostdlib \ - -Wl,--no-undefined \ - -Wl,--exclude-libs=ALL \ - -Wl,--warn-shared-textrel \ - -Wl,-O1 \ - -Wl,--as-needed - - -LOCAL_LDFLAGS_Release := \ - -Wl,-z,now \ - -Wl,-z,relro \ - -Wl,--fatal-warnings \ - -Wl,-z,noexecstack \ - -fPIC \ - -nostdlib \ - -Wl,--no-undefined \ - -Wl,--exclude-libs=ALL \ - -Wl,-O1 \ - -Wl,--as-needed \ - -Wl,--gc-sections \ - -Wl,--warn-shared-textrel - - -LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION)) - -LOCAL_STATIC_LIBRARIES := - -# Enable grouping to fix circular references -LOCAL_GROUP_STATIC_LIBRARIES := true - -LOCAL_SHARED_LIBRARIES := \ - libstlport \ - libdl - -# Add target alias to "gyp_all_modules" target. -.PHONY: gyp_all_modules -gyp_all_modules: third_party_webrtc_modules_acm2_gyp - -# Alias gyp target name. -.PHONY: acm2 -acm2: third_party_webrtc_modules_acm2_gyp - -include $(BUILD_STATIC_LIBRARY) diff --git a/modules/acm2.target.linux-mips.mk b/modules/acm2.target.linux-mips.mk deleted file mode 100644 index 3c220bbc..00000000 --- a/modules/acm2.target.linux-mips.mk +++ /dev/null @@ -1,362 +0,0 @@ -# This file is generated by gyp; do not edit. - -include $(CLEAR_VARS) - -LOCAL_MODULE_CLASS := STATIC_LIBRARIES -LOCAL_MODULE := third_party_webrtc_modules_acm2_gyp -LOCAL_MODULE_SUFFIX := .a -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) -gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) -gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) - -# Make sure our deps are built first. -GYP_TARGET_DEPENDENCIES := - -GYP_GENERATED_OUTPUTS := - -# Make sure our deps and generated files are built first. -LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS) - -LOCAL_CPP_EXTENSION := .cc -LOCAL_GENERATED_SOURCES := - -GYP_COPIED_SOURCE_ORIGIN_DIRS := - -LOCAL_SRC_FILES := \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_amr.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_amrwb.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_celt.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_cng.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_codec_database.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_dtmf_playout.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_g722.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_g7221.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_g7221c.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_g729.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_g7291.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_generic_codec.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_gsmfr.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_ilbc.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_isac.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_opus.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_speex.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_pcm16b.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_pcma.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_pcmu.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_red.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_receiver.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_resampler.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/audio_coding_module.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/call_statistics.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/initial_delay_manager.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/nack.cc - - -# Flags passed to both C and C++ files. -MY_CFLAGS_Debug := \ - -fstack-protector \ - --param=ssp-buffer-size=4 \ - \ - -fno-exceptions \ - -fno-strict-aliasing \ - -Wall \ - -Wno-unused-parameter \ - -Wno-missing-field-initializers \ - -fvisibility=hidden \ - -pipe \ - -fPIC \ - -mhard-float \ - -fno-builtin-cos \ - -fno-builtin-sin \ - -fno-builtin-cosf \ - -fno-builtin-sinf \ - -mhard-float \ - -fno-builtin-cos \ - -fno-builtin-sin \ - -fno-builtin-cosf \ - -fno-builtin-sinf \ - -EL \ - -mhard-float \ - -ffunction-sections \ - -funwind-tables \ - -g \ - -fstack-protector \ - -fno-short-enums \ - -finline-limit=64 \ - -Wa,--noexecstack \ - -U_FORTIFY_SOURCE \ - -Wno-extra \ - -Wno-ignored-qualifiers \ - -Wno-type-limits \ - -Wno-unused-but-set-variable \ - -Os \ - -g \ - -fomit-frame-pointer \ - -fdata-sections \ - -ffunction-sections \ - -funwind-tables - -MY_DEFS_Debug := \ - '-DV8_DEPRECATION_WARNINGS' \ - '-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \ - '-D_FILE_OFFSET_BITS=64' \ - '-DNO_TCMALLOC' \ - '-DDISABLE_NACL' \ - '-DCHROMIUM_BUILD' \ - '-DUSE_LIBJPEG_TURBO=1' \ - '-DENABLE_WEBRTC=1' \ - '-DUSE_PROPRIETARY_CODECS' \ - '-DENABLE_CONFIGURATION_POLICY' \ - '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ - '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ - '-DENABLE_EGLIMAGE=1' \ - '-DCLD_VERSION=1' \ - '-DENABLE_PRINTING=1' \ - '-DENABLE_MANAGED_USERS=1' \ - '-DWEBRTC_RESTRICT_LOGGING' \ - '-DWEBRTC_MODULE_UTILITY_VIDEO' \ - '-DWEBRTC_CHROMIUM_BUILD' \ - '-DMIPS32_LE' \ - '-DMIPS_FPU_LE' \ - '-DWEBRTC_POSIX' \ - '-DWEBRTC_LINUX' \ - '-DWEBRTC_ANDROID' \ - '-DWEBRTC_ANDROID_OPENSLES' \ - '-DWEBRTC_CODEC_OPUS' \ - '-DUSE_OPENSSL=1' \ - '-DUSE_OPENSSL_CERTS=1' \ - '-D__STDC_CONSTANT_MACROS' \ - '-D__STDC_FORMAT_MACROS' \ - '-DANDROID' \ - '-D__GNU_SOURCE=1' \ - '-DUSE_STLPORT=1' \ - '-D_STLP_USE_PTR_SPECIALIZATIONS=1' \ - '-DCHROME_BUILD_ID=""' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=1' \ - '-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \ - '-D_DEBUG' - - -# Include paths placed before CFLAGS/CPPFLAGS -LOCAL_C_INCLUDES_Debug := \ - $(LOCAL_PATH)/third_party \ - $(LOCAL_PATH) \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/main/interface \ - $(LOCAL_PATH)/third_party/webrtc/modules/interface \ - $(LOCAL_PATH)/third_party/webrtc \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/cng/include \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/g711/include \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/g722/include \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/ilbc/interface \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/isac/main/interface \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/isac/fix/interface \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/pcm16b/include \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/neteq/interface \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ - $(LOCAL_PATH)/third_party/opus/src/celt \ - $(LOCAL_PATH)/third_party/opus/src/src \ - $(LOCAL_PATH)/third_party/opus/src/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport - - -# Flags passed to only C++ (and not C) files. -LOCAL_CPPFLAGS_Debug := \ - -fno-rtti \ - -fno-threadsafe-statics \ - -fvisibility-inlines-hidden \ - -Wsign-compare \ - -Wno-uninitialized \ - -Wno-non-virtual-dtor \ - -Wno-sign-promo - - -# Flags passed to both C and C++ files. -MY_CFLAGS_Release := \ - -fstack-protector \ - --param=ssp-buffer-size=4 \ - \ - -fno-exceptions \ - -fno-strict-aliasing \ - -Wall \ - -Wno-unused-parameter \ - -Wno-missing-field-initializers \ - -fvisibility=hidden \ - -pipe \ - -fPIC \ - -mhard-float \ - -fno-builtin-cos \ - -fno-builtin-sin \ - -fno-builtin-cosf \ - -fno-builtin-sinf \ - -mhard-float \ - -fno-builtin-cos \ - -fno-builtin-sin \ - -fno-builtin-cosf \ - -fno-builtin-sinf \ - -EL \ - -mhard-float \ - -ffunction-sections \ - -funwind-tables \ - -g \ - -fstack-protector \ - -fno-short-enums \ - -finline-limit=64 \ - -Wa,--noexecstack \ - -U_FORTIFY_SOURCE \ - -Wno-extra \ - -Wno-ignored-qualifiers \ - -Wno-type-limits \ - -Wno-unused-but-set-variable \ - -Os \ - -fno-ident \ - -fdata-sections \ - -ffunction-sections \ - -fomit-frame-pointer \ - -funwind-tables - -MY_DEFS_Release := \ - '-DV8_DEPRECATION_WARNINGS' \ - '-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \ - '-D_FILE_OFFSET_BITS=64' \ - '-DNO_TCMALLOC' \ - '-DDISABLE_NACL' \ - '-DCHROMIUM_BUILD' \ - '-DUSE_LIBJPEG_TURBO=1' \ - '-DENABLE_WEBRTC=1' \ - '-DUSE_PROPRIETARY_CODECS' \ - '-DENABLE_CONFIGURATION_POLICY' \ - '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ - '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ - '-DENABLE_EGLIMAGE=1' \ - '-DCLD_VERSION=1' \ - '-DENABLE_PRINTING=1' \ - '-DENABLE_MANAGED_USERS=1' \ - '-DWEBRTC_RESTRICT_LOGGING' \ - '-DWEBRTC_MODULE_UTILITY_VIDEO' \ - '-DWEBRTC_CHROMIUM_BUILD' \ - '-DMIPS32_LE' \ - '-DMIPS_FPU_LE' \ - '-DWEBRTC_POSIX' \ - '-DWEBRTC_LINUX' \ - '-DWEBRTC_ANDROID' \ - '-DWEBRTC_ANDROID_OPENSLES' \ - '-DWEBRTC_CODEC_OPUS' \ - '-DUSE_OPENSSL=1' \ - '-DUSE_OPENSSL_CERTS=1' \ - '-D__STDC_CONSTANT_MACROS' \ - '-D__STDC_FORMAT_MACROS' \ - '-DANDROID' \ - '-D__GNU_SOURCE=1' \ - '-DUSE_STLPORT=1' \ - '-D_STLP_USE_PTR_SPECIALIZATIONS=1' \ - '-DCHROME_BUILD_ID=""' \ - '-DNDEBUG' \ - '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-D_FORTIFY_SOURCE=2' - - -# Include paths placed before CFLAGS/CPPFLAGS -LOCAL_C_INCLUDES_Release := \ - $(LOCAL_PATH)/third_party \ - $(LOCAL_PATH) \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/main/interface \ - $(LOCAL_PATH)/third_party/webrtc/modules/interface \ - $(LOCAL_PATH)/third_party/webrtc \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/cng/include \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/g711/include \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/g722/include \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/ilbc/interface \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/isac/main/interface \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/isac/fix/interface \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/pcm16b/include \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/neteq/interface \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ - $(LOCAL_PATH)/third_party/opus/src/celt \ - $(LOCAL_PATH)/third_party/opus/src/src \ - $(LOCAL_PATH)/third_party/opus/src/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport - - -# Flags passed to only C++ (and not C) files. -LOCAL_CPPFLAGS_Release := \ - -fno-rtti \ - -fno-threadsafe-statics \ - -fvisibility-inlines-hidden \ - -Wsign-compare \ - -Wno-uninitialized \ - -Wno-non-virtual-dtor \ - -Wno-sign-promo - - -LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) -LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) -LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) -LOCAL_ASFLAGS := $(LOCAL_CFLAGS) -### Rules for final target. - -LOCAL_LDFLAGS_Debug := \ - -Wl,-z,now \ - -Wl,-z,relro \ - -Wl,--fatal-warnings \ - -Wl,-z,noexecstack \ - -fPIC \ - -EL \ - -Wl,--no-keep-memory \ - -nostdlib \ - -Wl,--no-undefined \ - -Wl,--exclude-libs=ALL \ - -Wl,--warn-shared-textrel \ - -Wl,-O1 \ - -Wl,--as-needed - - -LOCAL_LDFLAGS_Release := \ - -Wl,-z,now \ - -Wl,-z,relro \ - -Wl,--fatal-warnings \ - -Wl,-z,noexecstack \ - -fPIC \ - -EL \ - -Wl,--no-keep-memory \ - -nostdlib \ - -Wl,--no-undefined \ - -Wl,--exclude-libs=ALL \ - -Wl,-O1 \ - -Wl,--as-needed \ - -Wl,--gc-sections \ - -Wl,--warn-shared-textrel - - -LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION)) - -LOCAL_STATIC_LIBRARIES := - -# Enable grouping to fix circular references -LOCAL_GROUP_STATIC_LIBRARIES := true - -LOCAL_SHARED_LIBRARIES := \ - libstlport \ - libdl - -# Add target alias to "gyp_all_modules" target. -.PHONY: gyp_all_modules -gyp_all_modules: third_party_webrtc_modules_acm2_gyp - -# Alias gyp target name. -.PHONY: acm2 -acm2: third_party_webrtc_modules_acm2_gyp - -include $(BUILD_STATIC_LIBRARY) diff --git a/modules/acm2.target.linux-x86.mk b/modules/acm2.target.linux-x86.mk deleted file mode 100644 index 94be33a5..00000000 --- a/modules/acm2.target.linux-x86.mk +++ /dev/null @@ -1,356 +0,0 @@ -# This file is generated by gyp; do not edit. - -include $(CLEAR_VARS) - -LOCAL_MODULE_CLASS := STATIC_LIBRARIES -LOCAL_MODULE := third_party_webrtc_modules_acm2_gyp -LOCAL_MODULE_SUFFIX := .a -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) -gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) -gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) - -# Make sure our deps are built first. -GYP_TARGET_DEPENDENCIES := - -GYP_GENERATED_OUTPUTS := - -# Make sure our deps and generated files are built first. -LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS) - -LOCAL_CPP_EXTENSION := .cc -LOCAL_GENERATED_SOURCES := - -GYP_COPIED_SOURCE_ORIGIN_DIRS := - -LOCAL_SRC_FILES := \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_amr.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_amrwb.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_celt.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_cng.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_codec_database.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_dtmf_playout.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_g722.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_g7221.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_g7221c.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_g729.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_g7291.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_generic_codec.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_gsmfr.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_ilbc.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_isac.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_opus.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_speex.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_pcm16b.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_pcma.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_pcmu.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_red.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_receiver.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_resampler.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/audio_coding_module.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/call_statistics.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/initial_delay_manager.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/nack.cc - - -# Flags passed to both C and C++ files. -MY_CFLAGS_Debug := \ - --param=ssp-buffer-size=4 \ - -Werror \ - -fno-exceptions \ - -fno-strict-aliasing \ - -Wall \ - -Wno-unused-parameter \ - -Wno-missing-field-initializers \ - -fvisibility=hidden \ - -pipe \ - -fPIC \ - -fno-builtin-cos \ - -fno-builtin-sin \ - -fno-builtin-cosf \ - -fno-builtin-sinf \ - -fno-builtin-cos \ - -fno-builtin-sin \ - -fno-builtin-cosf \ - -fno-builtin-sinf \ - -msse2 \ - -mfpmath=sse \ - -mmmx \ - -m32 \ - -fuse-ld=gold \ - -ffunction-sections \ - -funwind-tables \ - -g \ - -fno-short-enums \ - -finline-limit=64 \ - -Wa,--noexecstack \ - -U_FORTIFY_SOURCE \ - -Wno-extra \ - -Wno-ignored-qualifiers \ - -Wno-type-limits \ - -Wno-unused-but-set-variable \ - -fno-stack-protector \ - -Os \ - -g \ - -fomit-frame-pointer \ - -fdata-sections \ - -ffunction-sections \ - -funwind-tables - -MY_DEFS_Debug := \ - '-DV8_DEPRECATION_WARNINGS' \ - '-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \ - '-D_FILE_OFFSET_BITS=64' \ - '-DNO_TCMALLOC' \ - '-DDISABLE_NACL' \ - '-DCHROMIUM_BUILD' \ - '-DUSE_LIBJPEG_TURBO=1' \ - '-DENABLE_WEBRTC=1' \ - '-DUSE_PROPRIETARY_CODECS' \ - '-DENABLE_CONFIGURATION_POLICY' \ - '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ - '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ - '-DENABLE_EGLIMAGE=1' \ - '-DCLD_VERSION=1' \ - '-DENABLE_PRINTING=1' \ - '-DENABLE_MANAGED_USERS=1' \ - '-DWEBRTC_RESTRICT_LOGGING' \ - '-DWEBRTC_MODULE_UTILITY_VIDEO' \ - '-DWEBRTC_CHROMIUM_BUILD' \ - '-DWEBRTC_POSIX' \ - '-DWEBRTC_LINUX' \ - '-DWEBRTC_ANDROID' \ - '-DWEBRTC_ANDROID_OPENSLES' \ - '-DWEBRTC_CODEC_OPUS' \ - '-DUSE_OPENSSL=1' \ - '-DUSE_OPENSSL_CERTS=1' \ - '-D__STDC_CONSTANT_MACROS' \ - '-D__STDC_FORMAT_MACROS' \ - '-DANDROID' \ - '-D__GNU_SOURCE=1' \ - '-DUSE_STLPORT=1' \ - '-D_STLP_USE_PTR_SPECIALIZATIONS=1' \ - '-DCHROME_BUILD_ID=""' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=1' \ - '-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \ - '-D_DEBUG' - - -# Include paths placed before CFLAGS/CPPFLAGS -LOCAL_C_INCLUDES_Debug := \ - $(LOCAL_PATH)/third_party \ - $(LOCAL_PATH) \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/main/interface \ - $(LOCAL_PATH)/third_party/webrtc/modules/interface \ - $(LOCAL_PATH)/third_party/webrtc \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/cng/include \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/g711/include \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/g722/include \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/ilbc/interface \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/isac/main/interface \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/isac/fix/interface \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/pcm16b/include \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/neteq/interface \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ - $(LOCAL_PATH)/third_party/opus/src/celt \ - $(LOCAL_PATH)/third_party/opus/src/src \ - $(LOCAL_PATH)/third_party/opus/src/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport - - -# Flags passed to only C++ (and not C) files. -LOCAL_CPPFLAGS_Debug := \ - -fno-rtti \ - -fno-threadsafe-statics \ - -fvisibility-inlines-hidden \ - -Wsign-compare \ - -Wno-non-virtual-dtor \ - -Wno-sign-promo - - -# Flags passed to both C and C++ files. -MY_CFLAGS_Release := \ - --param=ssp-buffer-size=4 \ - -Werror \ - -fno-exceptions \ - -fno-strict-aliasing \ - -Wall \ - -Wno-unused-parameter \ - -Wno-missing-field-initializers \ - -fvisibility=hidden \ - -pipe \ - -fPIC \ - -fno-builtin-cos \ - -fno-builtin-sin \ - -fno-builtin-cosf \ - -fno-builtin-sinf \ - -fno-builtin-cos \ - -fno-builtin-sin \ - -fno-builtin-cosf \ - -fno-builtin-sinf \ - -msse2 \ - -mfpmath=sse \ - -mmmx \ - -m32 \ - -fuse-ld=gold \ - -ffunction-sections \ - -funwind-tables \ - -g \ - -fno-short-enums \ - -finline-limit=64 \ - -Wa,--noexecstack \ - -U_FORTIFY_SOURCE \ - -Wno-extra \ - -Wno-ignored-qualifiers \ - -Wno-type-limits \ - -Wno-unused-but-set-variable \ - -fno-stack-protector \ - -Os \ - -fno-ident \ - -fdata-sections \ - -ffunction-sections \ - -fomit-frame-pointer \ - -funwind-tables - -MY_DEFS_Release := \ - '-DV8_DEPRECATION_WARNINGS' \ - '-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \ - '-D_FILE_OFFSET_BITS=64' \ - '-DNO_TCMALLOC' \ - '-DDISABLE_NACL' \ - '-DCHROMIUM_BUILD' \ - '-DUSE_LIBJPEG_TURBO=1' \ - '-DENABLE_WEBRTC=1' \ - '-DUSE_PROPRIETARY_CODECS' \ - '-DENABLE_CONFIGURATION_POLICY' \ - '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ - '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ - '-DENABLE_EGLIMAGE=1' \ - '-DCLD_VERSION=1' \ - '-DENABLE_PRINTING=1' \ - '-DENABLE_MANAGED_USERS=1' \ - '-DWEBRTC_RESTRICT_LOGGING' \ - '-DWEBRTC_MODULE_UTILITY_VIDEO' \ - '-DWEBRTC_CHROMIUM_BUILD' \ - '-DWEBRTC_POSIX' \ - '-DWEBRTC_LINUX' \ - '-DWEBRTC_ANDROID' \ - '-DWEBRTC_ANDROID_OPENSLES' \ - '-DWEBRTC_CODEC_OPUS' \ - '-DUSE_OPENSSL=1' \ - '-DUSE_OPENSSL_CERTS=1' \ - '-D__STDC_CONSTANT_MACROS' \ - '-D__STDC_FORMAT_MACROS' \ - '-DANDROID' \ - '-D__GNU_SOURCE=1' \ - '-DUSE_STLPORT=1' \ - '-D_STLP_USE_PTR_SPECIALIZATIONS=1' \ - '-DCHROME_BUILD_ID=""' \ - '-DNDEBUG' \ - '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-D_FORTIFY_SOURCE=2' - - -# Include paths placed before CFLAGS/CPPFLAGS -LOCAL_C_INCLUDES_Release := \ - $(LOCAL_PATH)/third_party \ - $(LOCAL_PATH) \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/main/interface \ - $(LOCAL_PATH)/third_party/webrtc/modules/interface \ - $(LOCAL_PATH)/third_party/webrtc \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/cng/include \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/g711/include \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/g722/include \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/ilbc/interface \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/isac/main/interface \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/isac/fix/interface \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/pcm16b/include \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/neteq/interface \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ - $(LOCAL_PATH)/third_party/opus/src/celt \ - $(LOCAL_PATH)/third_party/opus/src/src \ - $(LOCAL_PATH)/third_party/opus/src/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport - - -# Flags passed to only C++ (and not C) files. -LOCAL_CPPFLAGS_Release := \ - -fno-rtti \ - -fno-threadsafe-statics \ - -fvisibility-inlines-hidden \ - -Wsign-compare \ - -Wno-non-virtual-dtor \ - -Wno-sign-promo - - -LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) -LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) -LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) -LOCAL_ASFLAGS := $(LOCAL_CFLAGS) -### Rules for final target. - -LOCAL_LDFLAGS_Debug := \ - -Wl,-z,now \ - -Wl,-z,relro \ - -Wl,--fatal-warnings \ - -Wl,-z,noexecstack \ - -fPIC \ - -m32 \ - -fuse-ld=gold \ - -nostdlib \ - -Wl,--no-undefined \ - -Wl,--exclude-libs=ALL \ - -Wl,--warn-shared-textrel \ - -Wl,-O1 \ - -Wl,--as-needed - - -LOCAL_LDFLAGS_Release := \ - -Wl,-z,now \ - -Wl,-z,relro \ - -Wl,--fatal-warnings \ - -Wl,-z,noexecstack \ - -fPIC \ - -m32 \ - -fuse-ld=gold \ - -nostdlib \ - -Wl,--no-undefined \ - -Wl,--exclude-libs=ALL \ - -Wl,-O1 \ - -Wl,--as-needed \ - -Wl,--gc-sections \ - -Wl,--warn-shared-textrel - - -LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION)) - -LOCAL_STATIC_LIBRARIES := - -# Enable grouping to fix circular references -LOCAL_GROUP_STATIC_LIBRARIES := true - -LOCAL_SHARED_LIBRARIES := \ - libstlport \ - libdl - -# Add target alias to "gyp_all_modules" target. -.PHONY: gyp_all_modules -gyp_all_modules: third_party_webrtc_modules_acm2_gyp - -# Alias gyp target name. -.PHONY: acm2 -acm2: third_party_webrtc_modules_acm2_gyp - -include $(BUILD_STATIC_LIBRARY) diff --git a/modules/acm2.target.linux-x86_64.mk b/modules/acm2.target.linux-x86_64.mk deleted file mode 100644 index e2c8787b..00000000 --- a/modules/acm2.target.linux-x86_64.mk +++ /dev/null @@ -1,356 +0,0 @@ -# This file is generated by gyp; do not edit. - -include $(CLEAR_VARS) - -LOCAL_MODULE_CLASS := STATIC_LIBRARIES -LOCAL_MODULE := third_party_webrtc_modules_acm2_gyp -LOCAL_MODULE_SUFFIX := .a -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) -gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) -gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) - -# Make sure our deps are built first. -GYP_TARGET_DEPENDENCIES := - -GYP_GENERATED_OUTPUTS := - -# Make sure our deps and generated files are built first. -LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS) - -LOCAL_CPP_EXTENSION := .cc -LOCAL_GENERATED_SOURCES := - -GYP_COPIED_SOURCE_ORIGIN_DIRS := - -LOCAL_SRC_FILES := \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_amr.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_amrwb.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_celt.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_cng.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_codec_database.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_dtmf_playout.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_g722.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_g7221.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_g7221c.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_g729.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_g7291.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_generic_codec.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_gsmfr.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_ilbc.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_isac.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_opus.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_speex.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_pcm16b.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_pcma.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_pcmu.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_red.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_receiver.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/acm_resampler.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/audio_coding_module.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/call_statistics.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/initial_delay_manager.cc \ - third_party/webrtc/modules/audio_coding/main/acm2/nack.cc - - -# Flags passed to both C and C++ files. -MY_CFLAGS_Debug := \ - -fstack-protector \ - --param=ssp-buffer-size=4 \ - -Werror \ - -fno-exceptions \ - -fno-strict-aliasing \ - -Wall \ - -Wno-unused-parameter \ - -Wno-missing-field-initializers \ - -fvisibility=hidden \ - -pipe \ - -fPIC \ - -Wno-unused-local-typedefs \ - -fno-builtin-cos \ - -fno-builtin-sin \ - -fno-builtin-cosf \ - -fno-builtin-sinf \ - -fno-builtin-cos \ - -fno-builtin-sin \ - -fno-builtin-cosf \ - -fno-builtin-sinf \ - -m64 \ - -march=x86-64 \ - -fuse-ld=gold \ - -ffunction-sections \ - -funwind-tables \ - -g \ - -fstack-protector \ - -fno-short-enums \ - -finline-limit=64 \ - -Wa,--noexecstack \ - -U_FORTIFY_SOURCE \ - -Wno-extra \ - -Wno-ignored-qualifiers \ - -Wno-type-limits \ - -Wno-unused-but-set-variable \ - -Os \ - -g \ - -fomit-frame-pointer \ - -fdata-sections \ - -ffunction-sections \ - -funwind-tables - -MY_DEFS_Debug := \ - '-DV8_DEPRECATION_WARNINGS' \ - '-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \ - '-D_FILE_OFFSET_BITS=64' \ - '-DNO_TCMALLOC' \ - '-DDISABLE_NACL' \ - '-DCHROMIUM_BUILD' \ - '-DUSE_LIBJPEG_TURBO=1' \ - '-DENABLE_WEBRTC=1' \ - '-DUSE_PROPRIETARY_CODECS' \ - '-DENABLE_CONFIGURATION_POLICY' \ - '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ - '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ - '-DENABLE_EGLIMAGE=1' \ - '-DCLD_VERSION=1' \ - '-DENABLE_PRINTING=1' \ - '-DENABLE_MANAGED_USERS=1' \ - '-DWEBRTC_RESTRICT_LOGGING' \ - '-DWEBRTC_MODULE_UTILITY_VIDEO' \ - '-DWEBRTC_CHROMIUM_BUILD' \ - '-DWEBRTC_POSIX' \ - '-DWEBRTC_LINUX' \ - '-DWEBRTC_ANDROID' \ - '-DWEBRTC_ANDROID_OPENSLES' \ - '-DWEBRTC_CODEC_OPUS' \ - '-DUSE_OPENSSL=1' \ - '-DUSE_OPENSSL_CERTS=1' \ - '-D__STDC_CONSTANT_MACROS' \ - '-D__STDC_FORMAT_MACROS' \ - '-DANDROID' \ - '-D__GNU_SOURCE=1' \ - '-DUSE_STLPORT=1' \ - '-D_STLP_USE_PTR_SPECIALIZATIONS=1' \ - '-DCHROME_BUILD_ID=""' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=1' \ - '-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \ - '-D_DEBUG' - - -# Include paths placed before CFLAGS/CPPFLAGS -LOCAL_C_INCLUDES_Debug := \ - $(LOCAL_PATH)/third_party \ - $(LOCAL_PATH) \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/main/interface \ - $(LOCAL_PATH)/third_party/webrtc/modules/interface \ - $(LOCAL_PATH)/third_party/webrtc \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/cng/include \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/g711/include \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/g722/include \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/ilbc/interface \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/isac/main/interface \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/isac/fix/interface \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/pcm16b/include \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/neteq/interface \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ - $(LOCAL_PATH)/third_party/opus/src/celt \ - $(LOCAL_PATH)/third_party/opus/src/src \ - $(LOCAL_PATH)/third_party/opus/src/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport - - -# Flags passed to only C++ (and not C) files. -LOCAL_CPPFLAGS_Debug := \ - -fno-rtti \ - -fno-threadsafe-statics \ - -fvisibility-inlines-hidden \ - -Wsign-compare \ - -Wno-non-virtual-dtor \ - -Wno-sign-promo - - -# Flags passed to both C and C++ files. -MY_CFLAGS_Release := \ - -fstack-protector \ - --param=ssp-buffer-size=4 \ - -Werror \ - -fno-exceptions \ - -fno-strict-aliasing \ - -Wall \ - -Wno-unused-parameter \ - -Wno-missing-field-initializers \ - -fvisibility=hidden \ - -pipe \ - -fPIC \ - -Wno-unused-local-typedefs \ - -fno-builtin-cos \ - -fno-builtin-sin \ - -fno-builtin-cosf \ - -fno-builtin-sinf \ - -fno-builtin-cos \ - -fno-builtin-sin \ - -fno-builtin-cosf \ - -fno-builtin-sinf \ - -m64 \ - -march=x86-64 \ - -fuse-ld=gold \ - -ffunction-sections \ - -funwind-tables \ - -g \ - -fstack-protector \ - -fno-short-enums \ - -finline-limit=64 \ - -Wa,--noexecstack \ - -U_FORTIFY_SOURCE \ - -Wno-extra \ - -Wno-ignored-qualifiers \ - -Wno-type-limits \ - -Wno-unused-but-set-variable \ - -Os \ - -fno-ident \ - -fdata-sections \ - -ffunction-sections \ - -fomit-frame-pointer \ - -funwind-tables - -MY_DEFS_Release := \ - '-DV8_DEPRECATION_WARNINGS' \ - '-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \ - '-D_FILE_OFFSET_BITS=64' \ - '-DNO_TCMALLOC' \ - '-DDISABLE_NACL' \ - '-DCHROMIUM_BUILD' \ - '-DUSE_LIBJPEG_TURBO=1' \ - '-DENABLE_WEBRTC=1' \ - '-DUSE_PROPRIETARY_CODECS' \ - '-DENABLE_CONFIGURATION_POLICY' \ - '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ - '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ - '-DENABLE_EGLIMAGE=1' \ - '-DCLD_VERSION=1' \ - '-DENABLE_PRINTING=1' \ - '-DENABLE_MANAGED_USERS=1' \ - '-DWEBRTC_RESTRICT_LOGGING' \ - '-DWEBRTC_MODULE_UTILITY_VIDEO' \ - '-DWEBRTC_CHROMIUM_BUILD' \ - '-DWEBRTC_POSIX' \ - '-DWEBRTC_LINUX' \ - '-DWEBRTC_ANDROID' \ - '-DWEBRTC_ANDROID_OPENSLES' \ - '-DWEBRTC_CODEC_OPUS' \ - '-DUSE_OPENSSL=1' \ - '-DUSE_OPENSSL_CERTS=1' \ - '-D__STDC_CONSTANT_MACROS' \ - '-D__STDC_FORMAT_MACROS' \ - '-DANDROID' \ - '-D__GNU_SOURCE=1' \ - '-DUSE_STLPORT=1' \ - '-D_STLP_USE_PTR_SPECIALIZATIONS=1' \ - '-DCHROME_BUILD_ID=""' \ - '-DNDEBUG' \ - '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-D_FORTIFY_SOURCE=2' - - -# Include paths placed before CFLAGS/CPPFLAGS -LOCAL_C_INCLUDES_Release := \ - $(LOCAL_PATH)/third_party \ - $(LOCAL_PATH) \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/main/interface \ - $(LOCAL_PATH)/third_party/webrtc/modules/interface \ - $(LOCAL_PATH)/third_party/webrtc \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/cng/include \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/g711/include \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/g722/include \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/ilbc/interface \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/isac/main/interface \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/isac/fix/interface \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/pcm16b/include \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/neteq/interface \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ - $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ - $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ - $(LOCAL_PATH)/third_party/opus/src/celt \ - $(LOCAL_PATH)/third_party/opus/src/src \ - $(LOCAL_PATH)/third_party/opus/src/include \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport - - -# Flags passed to only C++ (and not C) files. -LOCAL_CPPFLAGS_Release := \ - -fno-rtti \ - -fno-threadsafe-statics \ - -fvisibility-inlines-hidden \ - -Wsign-compare \ - -Wno-non-virtual-dtor \ - -Wno-sign-promo - - -LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) -LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) -LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) -LOCAL_ASFLAGS := $(LOCAL_CFLAGS) -### Rules for final target. - -LOCAL_LDFLAGS_Debug := \ - -Wl,-z,now \ - -Wl,-z,relro \ - -Wl,--fatal-warnings \ - -Wl,-z,noexecstack \ - -fPIC \ - -m64 \ - -fuse-ld=gold \ - -nostdlib \ - -Wl,--no-undefined \ - -Wl,--exclude-libs=ALL \ - -Wl,--warn-shared-textrel \ - -Wl,-O1 \ - -Wl,--as-needed - - -LOCAL_LDFLAGS_Release := \ - -Wl,-z,now \ - -Wl,-z,relro \ - -Wl,--fatal-warnings \ - -Wl,-z,noexecstack \ - -fPIC \ - -m64 \ - -fuse-ld=gold \ - -nostdlib \ - -Wl,--no-undefined \ - -Wl,--exclude-libs=ALL \ - -Wl,-O1 \ - -Wl,--as-needed \ - -Wl,--gc-sections \ - -Wl,--warn-shared-textrel - - -LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION)) - -LOCAL_STATIC_LIBRARIES := - -# Enable grouping to fix circular references -LOCAL_GROUP_STATIC_LIBRARIES := true - -LOCAL_SHARED_LIBRARIES := \ - libstlport \ - libdl - -# Add target alias to "gyp_all_modules" target. -.PHONY: gyp_all_modules -gyp_all_modules: third_party_webrtc_modules_acm2_gyp - -# Alias gyp target name. -.PHONY: acm2 -acm2: third_party_webrtc_modules_acm2_gyp - -include $(BUILD_STATIC_LIBRARY) diff --git a/modules/audio_coding_module.target.darwin-arm.mk b/modules/audio_coding_module.target.darwin-arm.mk index 683b8236..a35c1eff 100644 --- a/modules/audio_coding_module.target.darwin-arm.mk +++ b/modules/audio_coding_module.target.darwin-arm.mk @@ -24,31 +24,34 @@ LOCAL_GENERATED_SOURCES := GYP_COPIED_SOURCE_ORIGIN_DIRS := LOCAL_SRC_FILES := \ - third_party/webrtc/modules/audio_coding/main/source/acm_amr.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_amrwb.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_celt.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_cng.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_codec_database.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_dtmf_detection.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_dtmf_playout.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_g722.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_g7221.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_g7221c.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_g729.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_g7291.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_generic_codec.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_gsmfr.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_ilbc.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_isac.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_neteq.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_opus.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_speex.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_pcm16b.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_pcma.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_pcmu.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_red.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_resampler.cc \ - third_party/webrtc/modules/audio_coding/main/source/audio_coding_module_impl.cc + third_party/webrtc/modules/audio_coding/main/acm2/acm_amr.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_amrwb.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_celt.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_cng.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_codec_database.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_dtmf_playout.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_g722.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_g7221.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_g7221c.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_g729.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_g7291.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_generic_codec.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_gsmfr.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_ilbc.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_isac.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_opus.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_speex.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_pcm16b.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_pcma.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_pcmu.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_red.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_receiver.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_resampler.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/audio_coding_module.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/call_statistics.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/initial_delay_manager.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/nack.cc # Flags passed to both C and C++ files. @@ -150,11 +153,13 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/isac/main/interface \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/isac/fix/interface \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/pcm16b/include \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/neteq/interface \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ + $(LOCAL_PATH)/third_party/opus/src/celt \ + $(LOCAL_PATH)/third_party/opus/src/src \ + $(LOCAL_PATH)/third_party/opus/src/include \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport @@ -271,11 +276,13 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/isac/main/interface \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/isac/fix/interface \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/pcm16b/include \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/neteq/interface \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ + $(LOCAL_PATH)/third_party/opus/src/celt \ + $(LOCAL_PATH)/third_party/opus/src/src \ + $(LOCAL_PATH)/third_party/opus/src/include \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport diff --git a/modules/audio_coding_module.target.darwin-arm64.mk b/modules/audio_coding_module.target.darwin-arm64.mk index f661434d..3cd15290 100644 --- a/modules/audio_coding_module.target.darwin-arm64.mk +++ b/modules/audio_coding_module.target.darwin-arm64.mk @@ -24,31 +24,34 @@ LOCAL_GENERATED_SOURCES := GYP_COPIED_SOURCE_ORIGIN_DIRS := LOCAL_SRC_FILES := \ - third_party/webrtc/modules/audio_coding/main/source/acm_amr.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_amrwb.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_celt.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_cng.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_codec_database.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_dtmf_detection.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_dtmf_playout.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_g722.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_g7221.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_g7221c.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_g729.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_g7291.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_generic_codec.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_gsmfr.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_ilbc.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_isac.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_neteq.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_opus.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_speex.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_pcm16b.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_pcma.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_pcmu.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_red.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_resampler.cc \ - third_party/webrtc/modules/audio_coding/main/source/audio_coding_module_impl.cc + third_party/webrtc/modules/audio_coding/main/acm2/acm_amr.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_amrwb.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_celt.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_cng.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_codec_database.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_dtmf_playout.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_g722.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_g7221.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_g7221c.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_g729.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_g7291.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_generic_codec.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_gsmfr.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_ilbc.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_isac.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_opus.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_speex.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_pcm16b.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_pcma.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_pcmu.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_red.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_receiver.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_resampler.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/audio_coding_module.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/call_statistics.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/initial_delay_manager.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/nack.cc # Flags passed to both C and C++ files. @@ -143,11 +146,13 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/isac/main/interface \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/isac/fix/interface \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/pcm16b/include \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/neteq/interface \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ + $(LOCAL_PATH)/third_party/opus/src/celt \ + $(LOCAL_PATH)/third_party/opus/src/src \ + $(LOCAL_PATH)/third_party/opus/src/include \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport @@ -256,11 +261,13 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/isac/main/interface \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/isac/fix/interface \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/pcm16b/include \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/neteq/interface \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ + $(LOCAL_PATH)/third_party/opus/src/celt \ + $(LOCAL_PATH)/third_party/opus/src/src \ + $(LOCAL_PATH)/third_party/opus/src/include \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport diff --git a/modules/audio_coding_module.target.darwin-mips.mk b/modules/audio_coding_module.target.darwin-mips.mk index 9efe46e2..f1a9f719 100644 --- a/modules/audio_coding_module.target.darwin-mips.mk +++ b/modules/audio_coding_module.target.darwin-mips.mk @@ -24,31 +24,34 @@ LOCAL_GENERATED_SOURCES := GYP_COPIED_SOURCE_ORIGIN_DIRS := LOCAL_SRC_FILES := \ - third_party/webrtc/modules/audio_coding/main/source/acm_amr.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_amrwb.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_celt.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_cng.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_codec_database.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_dtmf_detection.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_dtmf_playout.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_g722.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_g7221.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_g7221c.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_g729.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_g7291.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_generic_codec.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_gsmfr.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_ilbc.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_isac.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_neteq.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_opus.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_speex.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_pcm16b.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_pcma.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_pcmu.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_red.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_resampler.cc \ - third_party/webrtc/modules/audio_coding/main/source/audio_coding_module_impl.cc + third_party/webrtc/modules/audio_coding/main/acm2/acm_amr.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_amrwb.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_celt.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_cng.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_codec_database.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_dtmf_playout.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_g722.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_g7221.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_g7221c.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_g729.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_g7291.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_generic_codec.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_gsmfr.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_ilbc.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_isac.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_opus.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_speex.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_pcm16b.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_pcma.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_pcmu.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_red.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_receiver.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_resampler.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/audio_coding_module.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/call_statistics.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/initial_delay_manager.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/nack.cc # Flags passed to both C and C++ files. @@ -150,11 +153,13 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/isac/main/interface \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/isac/fix/interface \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/pcm16b/include \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/neteq/interface \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ + $(LOCAL_PATH)/third_party/opus/src/celt \ + $(LOCAL_PATH)/third_party/opus/src/src \ + $(LOCAL_PATH)/third_party/opus/src/include \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport @@ -271,11 +276,13 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/isac/main/interface \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/isac/fix/interface \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/pcm16b/include \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/neteq/interface \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ + $(LOCAL_PATH)/third_party/opus/src/celt \ + $(LOCAL_PATH)/third_party/opus/src/src \ + $(LOCAL_PATH)/third_party/opus/src/include \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport diff --git a/modules/audio_coding_module.target.darwin-x86.mk b/modules/audio_coding_module.target.darwin-x86.mk index 9040f19b..dc9432a0 100644 --- a/modules/audio_coding_module.target.darwin-x86.mk +++ b/modules/audio_coding_module.target.darwin-x86.mk @@ -24,31 +24,34 @@ LOCAL_GENERATED_SOURCES := GYP_COPIED_SOURCE_ORIGIN_DIRS := LOCAL_SRC_FILES := \ - third_party/webrtc/modules/audio_coding/main/source/acm_amr.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_amrwb.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_celt.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_cng.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_codec_database.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_dtmf_detection.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_dtmf_playout.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_g722.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_g7221.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_g7221c.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_g729.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_g7291.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_generic_codec.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_gsmfr.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_ilbc.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_isac.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_neteq.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_opus.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_speex.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_pcm16b.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_pcma.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_pcmu.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_red.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_resampler.cc \ - third_party/webrtc/modules/audio_coding/main/source/audio_coding_module_impl.cc + third_party/webrtc/modules/audio_coding/main/acm2/acm_amr.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_amrwb.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_celt.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_cng.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_codec_database.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_dtmf_playout.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_g722.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_g7221.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_g7221c.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_g729.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_g7291.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_generic_codec.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_gsmfr.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_ilbc.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_isac.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_opus.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_speex.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_pcm16b.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_pcma.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_pcmu.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_red.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_receiver.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_resampler.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/audio_coding_module.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/call_statistics.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/initial_delay_manager.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/nack.cc # Flags passed to both C and C++ files. @@ -148,11 +151,13 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/isac/main/interface \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/isac/fix/interface \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/pcm16b/include \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/neteq/interface \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ + $(LOCAL_PATH)/third_party/opus/src/celt \ + $(LOCAL_PATH)/third_party/opus/src/src \ + $(LOCAL_PATH)/third_party/opus/src/include \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport @@ -266,11 +271,13 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/isac/main/interface \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/isac/fix/interface \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/pcm16b/include \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/neteq/interface \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ + $(LOCAL_PATH)/third_party/opus/src/celt \ + $(LOCAL_PATH)/third_party/opus/src/src \ + $(LOCAL_PATH)/third_party/opus/src/include \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport diff --git a/modules/audio_coding_module.target.darwin-x86_64.mk b/modules/audio_coding_module.target.darwin-x86_64.mk index 6b90bee9..f60e2f41 100644 --- a/modules/audio_coding_module.target.darwin-x86_64.mk +++ b/modules/audio_coding_module.target.darwin-x86_64.mk @@ -24,31 +24,34 @@ LOCAL_GENERATED_SOURCES := GYP_COPIED_SOURCE_ORIGIN_DIRS := LOCAL_SRC_FILES := \ - third_party/webrtc/modules/audio_coding/main/source/acm_amr.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_amrwb.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_celt.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_cng.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_codec_database.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_dtmf_detection.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_dtmf_playout.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_g722.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_g7221.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_g7221c.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_g729.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_g7291.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_generic_codec.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_gsmfr.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_ilbc.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_isac.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_neteq.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_opus.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_speex.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_pcm16b.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_pcma.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_pcmu.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_red.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_resampler.cc \ - third_party/webrtc/modules/audio_coding/main/source/audio_coding_module_impl.cc + third_party/webrtc/modules/audio_coding/main/acm2/acm_amr.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_amrwb.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_celt.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_cng.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_codec_database.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_dtmf_playout.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_g722.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_g7221.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_g7221c.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_g729.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_g7291.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_generic_codec.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_gsmfr.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_ilbc.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_isac.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_opus.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_speex.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_pcm16b.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_pcma.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_pcmu.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_red.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_receiver.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_resampler.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/audio_coding_module.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/call_statistics.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/initial_delay_manager.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/nack.cc # Flags passed to both C and C++ files. @@ -148,11 +151,13 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/isac/main/interface \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/isac/fix/interface \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/pcm16b/include \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/neteq/interface \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ + $(LOCAL_PATH)/third_party/opus/src/celt \ + $(LOCAL_PATH)/third_party/opus/src/src \ + $(LOCAL_PATH)/third_party/opus/src/include \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport @@ -266,11 +271,13 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/isac/main/interface \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/isac/fix/interface \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/pcm16b/include \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/neteq/interface \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ + $(LOCAL_PATH)/third_party/opus/src/celt \ + $(LOCAL_PATH)/third_party/opus/src/src \ + $(LOCAL_PATH)/third_party/opus/src/include \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport diff --git a/modules/audio_coding_module.target.linux-arm.mk b/modules/audio_coding_module.target.linux-arm.mk index 683b8236..a35c1eff 100644 --- a/modules/audio_coding_module.target.linux-arm.mk +++ b/modules/audio_coding_module.target.linux-arm.mk @@ -24,31 +24,34 @@ LOCAL_GENERATED_SOURCES := GYP_COPIED_SOURCE_ORIGIN_DIRS := LOCAL_SRC_FILES := \ - third_party/webrtc/modules/audio_coding/main/source/acm_amr.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_amrwb.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_celt.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_cng.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_codec_database.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_dtmf_detection.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_dtmf_playout.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_g722.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_g7221.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_g7221c.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_g729.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_g7291.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_generic_codec.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_gsmfr.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_ilbc.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_isac.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_neteq.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_opus.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_speex.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_pcm16b.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_pcma.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_pcmu.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_red.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_resampler.cc \ - third_party/webrtc/modules/audio_coding/main/source/audio_coding_module_impl.cc + third_party/webrtc/modules/audio_coding/main/acm2/acm_amr.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_amrwb.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_celt.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_cng.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_codec_database.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_dtmf_playout.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_g722.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_g7221.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_g7221c.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_g729.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_g7291.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_generic_codec.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_gsmfr.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_ilbc.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_isac.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_opus.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_speex.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_pcm16b.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_pcma.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_pcmu.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_red.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_receiver.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_resampler.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/audio_coding_module.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/call_statistics.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/initial_delay_manager.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/nack.cc # Flags passed to both C and C++ files. @@ -150,11 +153,13 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/isac/main/interface \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/isac/fix/interface \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/pcm16b/include \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/neteq/interface \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ + $(LOCAL_PATH)/third_party/opus/src/celt \ + $(LOCAL_PATH)/third_party/opus/src/src \ + $(LOCAL_PATH)/third_party/opus/src/include \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport @@ -271,11 +276,13 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/isac/main/interface \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/isac/fix/interface \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/pcm16b/include \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/neteq/interface \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ + $(LOCAL_PATH)/third_party/opus/src/celt \ + $(LOCAL_PATH)/third_party/opus/src/src \ + $(LOCAL_PATH)/third_party/opus/src/include \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport diff --git a/modules/audio_coding_module.target.linux-arm64.mk b/modules/audio_coding_module.target.linux-arm64.mk index f661434d..3cd15290 100644 --- a/modules/audio_coding_module.target.linux-arm64.mk +++ b/modules/audio_coding_module.target.linux-arm64.mk @@ -24,31 +24,34 @@ LOCAL_GENERATED_SOURCES := GYP_COPIED_SOURCE_ORIGIN_DIRS := LOCAL_SRC_FILES := \ - third_party/webrtc/modules/audio_coding/main/source/acm_amr.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_amrwb.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_celt.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_cng.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_codec_database.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_dtmf_detection.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_dtmf_playout.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_g722.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_g7221.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_g7221c.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_g729.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_g7291.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_generic_codec.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_gsmfr.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_ilbc.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_isac.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_neteq.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_opus.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_speex.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_pcm16b.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_pcma.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_pcmu.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_red.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_resampler.cc \ - third_party/webrtc/modules/audio_coding/main/source/audio_coding_module_impl.cc + third_party/webrtc/modules/audio_coding/main/acm2/acm_amr.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_amrwb.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_celt.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_cng.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_codec_database.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_dtmf_playout.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_g722.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_g7221.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_g7221c.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_g729.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_g7291.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_generic_codec.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_gsmfr.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_ilbc.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_isac.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_opus.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_speex.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_pcm16b.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_pcma.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_pcmu.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_red.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_receiver.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_resampler.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/audio_coding_module.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/call_statistics.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/initial_delay_manager.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/nack.cc # Flags passed to both C and C++ files. @@ -143,11 +146,13 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/isac/main/interface \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/isac/fix/interface \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/pcm16b/include \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/neteq/interface \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ + $(LOCAL_PATH)/third_party/opus/src/celt \ + $(LOCAL_PATH)/third_party/opus/src/src \ + $(LOCAL_PATH)/third_party/opus/src/include \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport @@ -256,11 +261,13 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/isac/main/interface \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/isac/fix/interface \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/pcm16b/include \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/neteq/interface \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ + $(LOCAL_PATH)/third_party/opus/src/celt \ + $(LOCAL_PATH)/third_party/opus/src/src \ + $(LOCAL_PATH)/third_party/opus/src/include \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport diff --git a/modules/audio_coding_module.target.linux-mips.mk b/modules/audio_coding_module.target.linux-mips.mk index 9efe46e2..f1a9f719 100644 --- a/modules/audio_coding_module.target.linux-mips.mk +++ b/modules/audio_coding_module.target.linux-mips.mk @@ -24,31 +24,34 @@ LOCAL_GENERATED_SOURCES := GYP_COPIED_SOURCE_ORIGIN_DIRS := LOCAL_SRC_FILES := \ - third_party/webrtc/modules/audio_coding/main/source/acm_amr.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_amrwb.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_celt.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_cng.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_codec_database.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_dtmf_detection.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_dtmf_playout.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_g722.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_g7221.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_g7221c.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_g729.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_g7291.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_generic_codec.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_gsmfr.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_ilbc.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_isac.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_neteq.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_opus.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_speex.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_pcm16b.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_pcma.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_pcmu.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_red.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_resampler.cc \ - third_party/webrtc/modules/audio_coding/main/source/audio_coding_module_impl.cc + third_party/webrtc/modules/audio_coding/main/acm2/acm_amr.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_amrwb.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_celt.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_cng.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_codec_database.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_dtmf_playout.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_g722.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_g7221.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_g7221c.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_g729.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_g7291.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_generic_codec.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_gsmfr.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_ilbc.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_isac.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_opus.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_speex.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_pcm16b.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_pcma.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_pcmu.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_red.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_receiver.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_resampler.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/audio_coding_module.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/call_statistics.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/initial_delay_manager.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/nack.cc # Flags passed to both C and C++ files. @@ -150,11 +153,13 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/isac/main/interface \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/isac/fix/interface \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/pcm16b/include \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/neteq/interface \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ + $(LOCAL_PATH)/third_party/opus/src/celt \ + $(LOCAL_PATH)/third_party/opus/src/src \ + $(LOCAL_PATH)/third_party/opus/src/include \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport @@ -271,11 +276,13 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/isac/main/interface \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/isac/fix/interface \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/pcm16b/include \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/neteq/interface \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ + $(LOCAL_PATH)/third_party/opus/src/celt \ + $(LOCAL_PATH)/third_party/opus/src/src \ + $(LOCAL_PATH)/third_party/opus/src/include \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport diff --git a/modules/audio_coding_module.target.linux-x86.mk b/modules/audio_coding_module.target.linux-x86.mk index 9040f19b..dc9432a0 100644 --- a/modules/audio_coding_module.target.linux-x86.mk +++ b/modules/audio_coding_module.target.linux-x86.mk @@ -24,31 +24,34 @@ LOCAL_GENERATED_SOURCES := GYP_COPIED_SOURCE_ORIGIN_DIRS := LOCAL_SRC_FILES := \ - third_party/webrtc/modules/audio_coding/main/source/acm_amr.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_amrwb.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_celt.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_cng.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_codec_database.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_dtmf_detection.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_dtmf_playout.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_g722.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_g7221.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_g7221c.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_g729.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_g7291.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_generic_codec.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_gsmfr.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_ilbc.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_isac.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_neteq.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_opus.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_speex.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_pcm16b.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_pcma.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_pcmu.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_red.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_resampler.cc \ - third_party/webrtc/modules/audio_coding/main/source/audio_coding_module_impl.cc + third_party/webrtc/modules/audio_coding/main/acm2/acm_amr.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_amrwb.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_celt.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_cng.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_codec_database.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_dtmf_playout.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_g722.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_g7221.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_g7221c.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_g729.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_g7291.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_generic_codec.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_gsmfr.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_ilbc.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_isac.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_opus.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_speex.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_pcm16b.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_pcma.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_pcmu.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_red.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_receiver.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_resampler.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/audio_coding_module.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/call_statistics.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/initial_delay_manager.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/nack.cc # Flags passed to both C and C++ files. @@ -148,11 +151,13 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/isac/main/interface \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/isac/fix/interface \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/pcm16b/include \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/neteq/interface \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ + $(LOCAL_PATH)/third_party/opus/src/celt \ + $(LOCAL_PATH)/third_party/opus/src/src \ + $(LOCAL_PATH)/third_party/opus/src/include \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport @@ -266,11 +271,13 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/isac/main/interface \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/isac/fix/interface \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/pcm16b/include \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/neteq/interface \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ + $(LOCAL_PATH)/third_party/opus/src/celt \ + $(LOCAL_PATH)/third_party/opus/src/src \ + $(LOCAL_PATH)/third_party/opus/src/include \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport diff --git a/modules/audio_coding_module.target.linux-x86_64.mk b/modules/audio_coding_module.target.linux-x86_64.mk index 6b90bee9..f60e2f41 100644 --- a/modules/audio_coding_module.target.linux-x86_64.mk +++ b/modules/audio_coding_module.target.linux-x86_64.mk @@ -24,31 +24,34 @@ LOCAL_GENERATED_SOURCES := GYP_COPIED_SOURCE_ORIGIN_DIRS := LOCAL_SRC_FILES := \ - third_party/webrtc/modules/audio_coding/main/source/acm_amr.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_amrwb.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_celt.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_cng.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_codec_database.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_dtmf_detection.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_dtmf_playout.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_g722.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_g7221.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_g7221c.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_g729.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_g7291.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_generic_codec.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_gsmfr.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_ilbc.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_isac.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_neteq.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_opus.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_speex.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_pcm16b.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_pcma.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_pcmu.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_red.cc \ - third_party/webrtc/modules/audio_coding/main/source/acm_resampler.cc \ - third_party/webrtc/modules/audio_coding/main/source/audio_coding_module_impl.cc + third_party/webrtc/modules/audio_coding/main/acm2/acm_amr.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_amrwb.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_celt.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_cng.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_codec_database.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_dtmf_playout.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_g722.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_g7221.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_g7221c.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_g729.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_g7291.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_generic_codec.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_gsmfr.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_ilbc.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_isac.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_opus.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_speex.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_pcm16b.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_pcma.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_pcmu.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_red.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_receiver.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/acm_resampler.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/audio_coding_module.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/call_statistics.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/initial_delay_manager.cc \ + third_party/webrtc/modules/audio_coding/main/acm2/nack.cc # Flags passed to both C and C++ files. @@ -148,11 +151,13 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/isac/main/interface \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/isac/fix/interface \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/pcm16b/include \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/neteq/interface \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ + $(LOCAL_PATH)/third_party/opus/src/celt \ + $(LOCAL_PATH)/third_party/opus/src/src \ + $(LOCAL_PATH)/third_party/opus/src/include \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport @@ -266,11 +271,13 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/isac/main/interface \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/isac/fix/interface \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/pcm16b/include \ - $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/neteq/interface \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ + $(LOCAL_PATH)/third_party/opus/src/celt \ + $(LOCAL_PATH)/third_party/opus/src/src \ + $(LOCAL_PATH)/third_party/opus/src/include \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport diff --git a/modules/audio_processing/gen_aecm_core_neon_offsets_h.target.darwin-arm.mk b/modules/audio_processing/gen_aecm_core_neon_offsets_h.target.darwin-arm.mk index 0f8e5ef6..3b2e3de9 100644 --- a/modules/audio_processing/gen_aecm_core_neon_offsets_h.target.darwin-arm.mk +++ b/modules/audio_processing/gen_aecm_core_neon_offsets_h.target.darwin-arm.mk @@ -23,7 +23,7 @@ $(gyp_shared_intermediate_dir)/audio_processing/asm_offsets/aecm_core_neon_offse $(gyp_shared_intermediate_dir)/audio_processing/asm_offsets/aecm_core_neon_offsets.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) $(gyp_shared_intermediate_dir)/audio_processing/asm_offsets/aecm_core_neon_offsets.o: $(LOCAL_PATH)/third_party/libvpx/unpack_lib_posix.sh $(GYP_TARGET_DEPENDENCIES) @echo "Gyp action: third_party_webrtc_modules_audio_processing_gen_core_neon_offsets_chromium_gyp_gen_aecm_core_neon_offsets_h_target_unpack_lib_posix ($@)" - $(hide)cd $(gyp_local_path)/third_party/webrtc/modules/audio_processing; mkdir -p $(gyp_shared_intermediate_dir)/audio_processing/asm_offsets; ../../../../third_party/libvpx/unpack_lib_posix.sh -d "$(gyp_shared_intermediate_dir)/audio_processing/asm_offsets" -f aecm_core_neon_offsets.o -a "$(gyp_shared_intermediate_dir)/lib_core_neon_offsets.a" -a "$(obj).$(TOOLSET)/webrtc/modules/audio_processing/lib_core_neon_offsets.a" -a "$(obj).$(TOOLSET)/third_party/webrtc/modules/audio_processing/lib_core_neon_offsets.a" -a "$(PWD)/$(call intermediates-dir-for, STATIC_LIBRARIES, lib_core_neon_offsets,,, $(GYP_VAR_PREFIX))/lib_core_neon_offsets.a" -r "$(realpath $($(GYP_VAR_PREFIX)TARGET_AR))" + $(hide)cd $(gyp_local_path)/third_party/webrtc/modules/audio_processing; mkdir -p $(gyp_shared_intermediate_dir)/audio_processing/asm_offsets; ../../../../third_party/libvpx/unpack_lib_posix.sh -d "$(gyp_shared_intermediate_dir)/audio_processing/asm_offsets" -f aecm_core_neon_offsets.o -a "$(gyp_shared_intermediate_dir)/lib_core_neon_offsets.a" -a "$(obj).$(TOOLSET)/webrtc/modules/audio_processing/lib_core_neon_offsets.a" -a "$(obj).$(TOOLSET)/third_party/webrtc/modules/audio_processing/lib_core_neon_offsets.a" -a "$(realpath $(call intermediates-dir-for, STATIC_LIBRARIES, lib_core_neon_offsets,,, $(GYP_VAR_PREFIX)))/lib_core_neon_offsets.a" -r "$(realpath $($(GYP_VAR_PREFIX)TARGET_AR))" diff --git a/modules/audio_processing/gen_aecm_core_neon_offsets_h.target.linux-arm.mk b/modules/audio_processing/gen_aecm_core_neon_offsets_h.target.linux-arm.mk index 0f8e5ef6..3b2e3de9 100644 --- a/modules/audio_processing/gen_aecm_core_neon_offsets_h.target.linux-arm.mk +++ b/modules/audio_processing/gen_aecm_core_neon_offsets_h.target.linux-arm.mk @@ -23,7 +23,7 @@ $(gyp_shared_intermediate_dir)/audio_processing/asm_offsets/aecm_core_neon_offse $(gyp_shared_intermediate_dir)/audio_processing/asm_offsets/aecm_core_neon_offsets.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) $(gyp_shared_intermediate_dir)/audio_processing/asm_offsets/aecm_core_neon_offsets.o: $(LOCAL_PATH)/third_party/libvpx/unpack_lib_posix.sh $(GYP_TARGET_DEPENDENCIES) @echo "Gyp action: third_party_webrtc_modules_audio_processing_gen_core_neon_offsets_chromium_gyp_gen_aecm_core_neon_offsets_h_target_unpack_lib_posix ($@)" - $(hide)cd $(gyp_local_path)/third_party/webrtc/modules/audio_processing; mkdir -p $(gyp_shared_intermediate_dir)/audio_processing/asm_offsets; ../../../../third_party/libvpx/unpack_lib_posix.sh -d "$(gyp_shared_intermediate_dir)/audio_processing/asm_offsets" -f aecm_core_neon_offsets.o -a "$(gyp_shared_intermediate_dir)/lib_core_neon_offsets.a" -a "$(obj).$(TOOLSET)/webrtc/modules/audio_processing/lib_core_neon_offsets.a" -a "$(obj).$(TOOLSET)/third_party/webrtc/modules/audio_processing/lib_core_neon_offsets.a" -a "$(PWD)/$(call intermediates-dir-for, STATIC_LIBRARIES, lib_core_neon_offsets,,, $(GYP_VAR_PREFIX))/lib_core_neon_offsets.a" -r "$(realpath $($(GYP_VAR_PREFIX)TARGET_AR))" + $(hide)cd $(gyp_local_path)/third_party/webrtc/modules/audio_processing; mkdir -p $(gyp_shared_intermediate_dir)/audio_processing/asm_offsets; ../../../../third_party/libvpx/unpack_lib_posix.sh -d "$(gyp_shared_intermediate_dir)/audio_processing/asm_offsets" -f aecm_core_neon_offsets.o -a "$(gyp_shared_intermediate_dir)/lib_core_neon_offsets.a" -a "$(obj).$(TOOLSET)/webrtc/modules/audio_processing/lib_core_neon_offsets.a" -a "$(obj).$(TOOLSET)/third_party/webrtc/modules/audio_processing/lib_core_neon_offsets.a" -a "$(realpath $(call intermediates-dir-for, STATIC_LIBRARIES, lib_core_neon_offsets,,, $(GYP_VAR_PREFIX)))/lib_core_neon_offsets.a" -r "$(realpath $($(GYP_VAR_PREFIX)TARGET_AR))" diff --git a/modules/audio_processing/gen_nsx_core_neon_offsets_h.target.darwin-arm.mk b/modules/audio_processing/gen_nsx_core_neon_offsets_h.target.darwin-arm.mk index 49b501d4..d82ef392 100644 --- a/modules/audio_processing/gen_nsx_core_neon_offsets_h.target.darwin-arm.mk +++ b/modules/audio_processing/gen_nsx_core_neon_offsets_h.target.darwin-arm.mk @@ -23,7 +23,7 @@ $(gyp_shared_intermediate_dir)/audio_processing/asm_offsets/nsx_core_neon_offset $(gyp_shared_intermediate_dir)/audio_processing/asm_offsets/nsx_core_neon_offsets.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) $(gyp_shared_intermediate_dir)/audio_processing/asm_offsets/nsx_core_neon_offsets.o: $(LOCAL_PATH)/third_party/libvpx/unpack_lib_posix.sh $(GYP_TARGET_DEPENDENCIES) @echo "Gyp action: third_party_webrtc_modules_audio_processing_gen_core_neon_offsets_chromium_gyp_gen_nsx_core_neon_offsets_h_target_unpack_lib_posix ($@)" - $(hide)cd $(gyp_local_path)/third_party/webrtc/modules/audio_processing; mkdir -p $(gyp_shared_intermediate_dir)/audio_processing/asm_offsets; ../../../../third_party/libvpx/unpack_lib_posix.sh -d "$(gyp_shared_intermediate_dir)/audio_processing/asm_offsets" -f nsx_core_neon_offsets.o -a "$(gyp_shared_intermediate_dir)/lib_core_neon_offsets.a" -a "$(obj).$(TOOLSET)/webrtc/modules/audio_processing/lib_core_neon_offsets.a" -a "$(obj).$(TOOLSET)/third_party/webrtc/modules/audio_processing/lib_core_neon_offsets.a" -a "$(PWD)/$(call intermediates-dir-for, STATIC_LIBRARIES, lib_core_neon_offsets,,, $(GYP_VAR_PREFIX))/lib_core_neon_offsets.a" -r "$(realpath $($(GYP_VAR_PREFIX)TARGET_AR))" + $(hide)cd $(gyp_local_path)/third_party/webrtc/modules/audio_processing; mkdir -p $(gyp_shared_intermediate_dir)/audio_processing/asm_offsets; ../../../../third_party/libvpx/unpack_lib_posix.sh -d "$(gyp_shared_intermediate_dir)/audio_processing/asm_offsets" -f nsx_core_neon_offsets.o -a "$(gyp_shared_intermediate_dir)/lib_core_neon_offsets.a" -a "$(obj).$(TOOLSET)/webrtc/modules/audio_processing/lib_core_neon_offsets.a" -a "$(obj).$(TOOLSET)/third_party/webrtc/modules/audio_processing/lib_core_neon_offsets.a" -a "$(realpath $(call intermediates-dir-for, STATIC_LIBRARIES, lib_core_neon_offsets,,, $(GYP_VAR_PREFIX)))/lib_core_neon_offsets.a" -r "$(realpath $($(GYP_VAR_PREFIX)TARGET_AR))" diff --git a/modules/audio_processing/gen_nsx_core_neon_offsets_h.target.linux-arm.mk b/modules/audio_processing/gen_nsx_core_neon_offsets_h.target.linux-arm.mk index 49b501d4..d82ef392 100644 --- a/modules/audio_processing/gen_nsx_core_neon_offsets_h.target.linux-arm.mk +++ b/modules/audio_processing/gen_nsx_core_neon_offsets_h.target.linux-arm.mk @@ -23,7 +23,7 @@ $(gyp_shared_intermediate_dir)/audio_processing/asm_offsets/nsx_core_neon_offset $(gyp_shared_intermediate_dir)/audio_processing/asm_offsets/nsx_core_neon_offsets.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) $(gyp_shared_intermediate_dir)/audio_processing/asm_offsets/nsx_core_neon_offsets.o: $(LOCAL_PATH)/third_party/libvpx/unpack_lib_posix.sh $(GYP_TARGET_DEPENDENCIES) @echo "Gyp action: third_party_webrtc_modules_audio_processing_gen_core_neon_offsets_chromium_gyp_gen_nsx_core_neon_offsets_h_target_unpack_lib_posix ($@)" - $(hide)cd $(gyp_local_path)/third_party/webrtc/modules/audio_processing; mkdir -p $(gyp_shared_intermediate_dir)/audio_processing/asm_offsets; ../../../../third_party/libvpx/unpack_lib_posix.sh -d "$(gyp_shared_intermediate_dir)/audio_processing/asm_offsets" -f nsx_core_neon_offsets.o -a "$(gyp_shared_intermediate_dir)/lib_core_neon_offsets.a" -a "$(obj).$(TOOLSET)/webrtc/modules/audio_processing/lib_core_neon_offsets.a" -a "$(obj).$(TOOLSET)/third_party/webrtc/modules/audio_processing/lib_core_neon_offsets.a" -a "$(PWD)/$(call intermediates-dir-for, STATIC_LIBRARIES, lib_core_neon_offsets,,, $(GYP_VAR_PREFIX))/lib_core_neon_offsets.a" -r "$(realpath $($(GYP_VAR_PREFIX)TARGET_AR))" + $(hide)cd $(gyp_local_path)/third_party/webrtc/modules/audio_processing; mkdir -p $(gyp_shared_intermediate_dir)/audio_processing/asm_offsets; ../../../../third_party/libvpx/unpack_lib_posix.sh -d "$(gyp_shared_intermediate_dir)/audio_processing/asm_offsets" -f nsx_core_neon_offsets.o -a "$(gyp_shared_intermediate_dir)/lib_core_neon_offsets.a" -a "$(obj).$(TOOLSET)/webrtc/modules/audio_processing/lib_core_neon_offsets.a" -a "$(obj).$(TOOLSET)/third_party/webrtc/modules/audio_processing/lib_core_neon_offsets.a" -a "$(realpath $(call intermediates-dir-for, STATIC_LIBRARIES, lib_core_neon_offsets,,, $(GYP_VAR_PREFIX)))/lib_core_neon_offsets.a" -r "$(realpath $($(GYP_VAR_PREFIX)TARGET_AR))" |