diff options
| author | Torne (Richard Coles) <torne@google.com> | 2014-11-06 11:12:39 +0000 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2014-11-06 11:12:39 +0000 |
| commit | 77155b05052120107f7496d7c424ee24e6420550 (patch) | |
| tree | 5013368c038081fc9d542ad65efe3ec381540eb2 /common_audio/common_audio.target.linux-arm.mk | |
| parent | 401138990c86cc095df3bac0acaf3951b393e32e (diff) | |
| parent | b44eb8f9b54e77b4ac5c426ea947f72a6ad74aad (diff) | |
| download | webrtc-77155b05052120107f7496d7c424ee24e6420550.tar.gz | |
Merge from Chromium at DEPS revision db3f05efe0f9
This commit was generated by merge_to_master.py.
Change-Id: Ibb07e7633f0f96e925c9bd5cdcb91747ad656b6e
Diffstat (limited to 'common_audio/common_audio.target.linux-arm.mk')
| -rw-r--r-- | common_audio/common_audio.target.linux-arm.mk | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/common_audio/common_audio.target.linux-arm.mk b/common_audio/common_audio.target.linux-arm.mk index 4d28e2eb..1ee1df1d 100644 --- a/common_audio/common_audio.target.linux-arm.mk +++ b/common_audio/common_audio.target.linux-arm.mk @@ -24,6 +24,7 @@ LOCAL_GENERATED_SOURCES := GYP_COPIED_SOURCE_ORIGIN_DIRS := LOCAL_SRC_FILES := \ + third_party/webrtc/common_audio/audio_converter.cc \ third_party/webrtc/common_audio/audio_util.cc \ third_party/webrtc/common_audio/blocker.cc \ third_party/webrtc/common_audio/fir_filter.cc \ @@ -61,13 +62,14 @@ LOCAL_SRC_FILES := \ third_party/webrtc/common_audio/signal_processing/splitting_filter.c \ third_party/webrtc/common_audio/signal_processing/sqrt_of_one_minus_x_squared.c \ third_party/webrtc/common_audio/signal_processing/vector_scaling_operations.c \ + third_party/webrtc/common_audio/vad/vad.cc \ third_party/webrtc/common_audio/vad/webrtc_vad.c \ third_party/webrtc/common_audio/vad/vad_core.c \ third_party/webrtc/common_audio/vad/vad_filterbank.c \ third_party/webrtc/common_audio/vad/vad_gmm.c \ third_party/webrtc/common_audio/vad/vad_sp.c \ third_party/webrtc/common_audio/wav_header.cc \ - third_party/webrtc/common_audio/wav_writer.cc \ + third_party/webrtc/common_audio/wav_file.cc \ third_party/webrtc/common_audio/window_generator.cc \ third_party/webrtc/common_audio/lapped_transform.cc \ third_party/webrtc/common_audio/real_fourier.cc \ @@ -132,11 +134,13 @@ MY_DEFS_Debug := \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NOTIFICATIONS' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ - '-DENABLE_EGLIMAGE=1' \ + '-DDONT_EMBED_BUILD_METADATA' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ + '-DENABLE_BASIC_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ '-DVIDEO_HOLE=1' \ '-DENABLE_LOAD_COMPLETION_HACKS=1' \ @@ -153,6 +157,7 @@ MY_DEFS_Debug := \ '-DWEBRTC_ANDROID' \ '-DWEBRTC_ANDROID_OPENSLES' \ '-DDL_ARM_NEON_OPTIONAL' \ + '-DUSE_LIBPCI=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-D__STDC_CONSTANT_MACROS' \ @@ -249,11 +254,13 @@ MY_DEFS_Release := \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NOTIFICATIONS' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ - '-DENABLE_EGLIMAGE=1' \ + '-DDONT_EMBED_BUILD_METADATA' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ + '-DENABLE_BASIC_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ '-DVIDEO_HOLE=1' \ '-DENABLE_LOAD_COMPLETION_HACKS=1' \ @@ -270,6 +277,7 @@ MY_DEFS_Release := \ '-DWEBRTC_ANDROID' \ '-DWEBRTC_ANDROID_OPENSLES' \ '-DDL_ARM_NEON_OPTIONAL' \ + '-DUSE_LIBPCI=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-D__STDC_CONSTANT_MACROS' \ |