summaryrefslogtreecommitdiff
path: root/modules/audioproc_debug_proto.target.darwin-mips.mk
diff options
context:
space:
mode:
authorAndroid Chromium Automerger <chromium-automerger@android>2014-03-12 09:46:45 +0000
committerAndroid Chromium Automerger <chromium-automerger@android>2014-03-12 09:46:45 +0000
commit6ae5588d130a64ab44e9892495f138e67ce1d6de (patch)
tree9df285f52e7097102c77a9748b98d782bd3e1fd9 /modules/audioproc_debug_proto.target.darwin-mips.mk
parent8d9f6d0c63b44c0af134da69275996db811e4d96 (diff)
downloadwebrtc-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/audioproc_debug_proto.target.darwin-mips.mk')
-rw-r--r--modules/audioproc_debug_proto.target.darwin-mips.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/audioproc_debug_proto.target.darwin-mips.mk b/modules/audioproc_debug_proto.target.darwin-mips.mk
index bef67012..3ad59e01 100644
--- a/modules/audioproc_debug_proto.target.darwin-mips.mk
+++ b/modules/audioproc_debug_proto.target.darwin-mips.mk
@@ -111,7 +111,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' \
@@ -128,6 +127,7 @@ MY_DEFS_Debug := \
'-DPROTOBUF_USE_DLLS' \
'-DGOOGLE_PROTOBUF_NO_RTTI' \
'-DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER' \
+ '-DUSE_OPENSSL=1' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
'-DANDROID' \
@@ -221,7 +221,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' \
@@ -238,6 +237,7 @@ MY_DEFS_Release := \
'-DPROTOBUF_USE_DLLS' \
'-DGOOGLE_PROTOBUF_NO_RTTI' \
'-DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER' \
+ '-DUSE_OPENSSL=1' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
'-DANDROID' \