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 /modules/G711.target.linux-x86.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 'modules/G711.target.linux-x86.mk')
| -rw-r--r-- | modules/G711.target.linux-x86.mk | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/modules/G711.target.linux-x86.mk b/modules/G711.target.linux-x86.mk index 6bbab2ab..ac39ccbc 100644 --- a/modules/G711.target.linux-x86.mk +++ b/modules/G711.target.linux-x86.mk @@ -18,13 +18,15 @@ 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/codecs/g711/g711_interface.c \ - third_party/webrtc/modules/audio_coding/codecs/g711/g711.c + third_party/webrtc/modules/audio_coding/codecs/g711/g711.c \ + third_party/webrtc/modules/audio_coding/codecs/g711/audio_encoder_pcm.cc # Flags passed to both C and C++ files. @@ -82,11 +84,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' \ @@ -99,6 +103,7 @@ MY_DEFS_Debug := \ '-DWEBRTC_LINUX' \ '-DWEBRTC_ANDROID' \ '-DWEBRTC_ANDROID_OPENSLES' \ + '-DUSE_LIBPCI=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-D__STDC_CONSTANT_MACROS' \ @@ -191,11 +196,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' \ @@ -208,6 +215,7 @@ MY_DEFS_Release := \ '-DWEBRTC_LINUX' \ '-DWEBRTC_ANDROID' \ '-DWEBRTC_ANDROID_OPENSLES' \ + '-DUSE_LIBPCI=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-D__STDC_CONSTANT_MACROS' \ |