diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-03-12 09:46:45 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-03-12 09:46:45 +0000 |
| commit | 6ae5588d130a64ab44e9892495f138e67ce1d6de (patch) | |
| tree | 9df285f52e7097102c77a9748b98d782bd3e1fd9 /modules/webrtc_video_coding.target.linux-x86.mk | |
| parent | 8d9f6d0c63b44c0af134da69275996db811e4d96 (diff) | |
| download | webrtc-6ae5588d130a64ab44e9892495f138e67ce1d6de.tar.gz | |
Update makefiles after merge of Chromium at 256489
This commit was generated by merge_from_chromium.py.
Change-Id: If4b80a409438e889814eb680645a98a4b196dfb1
Diffstat (limited to 'modules/webrtc_video_coding.target.linux-x86.mk')
| -rw-r--r-- | modules/webrtc_video_coding.target.linux-x86.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/webrtc_video_coding.target.linux-x86.mk b/modules/webrtc_video_coding.target.linux-x86.mk index cbbb7c5d..a950d160 100644 --- a/modules/webrtc_video_coding.target.linux-x86.mk +++ b/modules/webrtc_video_coding.target.linux-x86.mk @@ -107,7 +107,6 @@ MY_DEFS_Debug := \ '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ - '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ @@ -119,6 +118,7 @@ MY_DEFS_Debug := \ '-DWEBRTC_LINUX' \ '-DWEBRTC_ANDROID' \ '-DWEBRTC_ANDROID_OPENSLES' \ + '-DUSE_OPENSSL=1' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ @@ -211,7 +211,6 @@ MY_DEFS_Release := \ '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ - '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ @@ -223,6 +222,7 @@ MY_DEFS_Release := \ '-DWEBRTC_LINUX' \ '-DWEBRTC_ANDROID' \ '-DWEBRTC_ANDROID_OPENSLES' \ + '-DUSE_OPENSSL=1' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ |