diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-08-04 09:24:42 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-08-04 09:24:42 +0000 |
| commit | 8661714f95315bd471674b14e682aa6991eb370f (patch) | |
| tree | 7451e68ab8bb0edaedcadb34934faf90e9df7e23 /voice_engine/voice_engine.target.darwin-mips.mk | |
| parent | fa5085428e6672f7f9e88a652e3c4a7f9c93d116 (diff) | |
| download | webrtc-8661714f95315bd471674b14e682aa6991eb370f.tar.gz | |
Update makefiles after merge of Chromium at 287308
This commit was generated by merge_from_chromium.py.
Change-Id: I85bf9681e9c3bbef9f67d93b3d275289e6911e3c
Diffstat (limited to 'voice_engine/voice_engine.target.darwin-mips.mk')
| -rw-r--r-- | voice_engine/voice_engine.target.darwin-mips.mk | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/voice_engine/voice_engine.target.darwin-mips.mk b/voice_engine/voice_engine.target.darwin-mips.mk index e508e64f..a0464d77 100644 --- a/voice_engine/voice_engine.target.darwin-mips.mk +++ b/voice_engine/voice_engine.target.darwin-mips.mk @@ -30,6 +30,7 @@ LOCAL_SRC_FILES := \ third_party/webrtc/voice_engine/dtmf_inband_queue.cc \ third_party/webrtc/voice_engine/level_indicator.cc \ third_party/webrtc/voice_engine/monitor_module.cc \ + third_party/webrtc/voice_engine/network_predictor.cc \ third_party/webrtc/voice_engine/output_mixer.cc \ third_party/webrtc/voice_engine/shared_data.cc \ third_party/webrtc/voice_engine/statistics.cc \ @@ -106,7 +107,6 @@ MY_DEFS_Debug := \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ - '-DCLD_DATA_FROM_STATIC' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ @@ -230,7 +230,6 @@ MY_DEFS_Release := \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ - '-DCLD_DATA_FROM_STATIC' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ |