diff options
author | Android Chromium Automerger <chromium-automerger@android> | 2014-10-31 21:02:28 +0000 |
---|---|---|
committer | Android Chromium Automerger <chromium-automerger@android> | 2014-10-31 21:02:28 +0000 |
commit | 2dc72e3be449734e64ff706df1765ac1bfe64b23 (patch) | |
tree | 6e20c2450ea2cc9b34a4211d01792d268167de3e /voice_engine | |
parent | 1d09eeddd29d52c72af12516dc75dd24bcdd5920 (diff) | |
download | webrtc-2dc72e3be449734e64ff706df1765ac1bfe64b23.tar.gz |
Update makefiles after merge of Chromium at a41c404b1c7f
This commit was generated by merge_from_chromium.py.
Change-Id: Ifcab5d7c5bd698b1a0a72100960585183048352d
Diffstat (limited to 'voice_engine')
-rw-r--r-- | voice_engine/voice_engine.target.darwin-arm.mk | 2 | ||||
-rw-r--r-- | voice_engine/voice_engine.target.darwin-arm64.mk | 2 | ||||
-rw-r--r-- | voice_engine/voice_engine.target.darwin-mips.mk | 2 | ||||
-rw-r--r-- | voice_engine/voice_engine.target.darwin-x86.mk | 2 | ||||
-rw-r--r-- | voice_engine/voice_engine.target.darwin-x86_64.mk | 2 | ||||
-rw-r--r-- | voice_engine/voice_engine.target.linux-arm.mk | 2 | ||||
-rw-r--r-- | voice_engine/voice_engine.target.linux-arm64.mk | 2 | ||||
-rw-r--r-- | voice_engine/voice_engine.target.linux-mips.mk | 2 | ||||
-rw-r--r-- | voice_engine/voice_engine.target.linux-x86.mk | 2 | ||||
-rw-r--r-- | voice_engine/voice_engine.target.linux-x86_64.mk | 2 |
10 files changed, 20 insertions, 0 deletions
diff --git a/voice_engine/voice_engine.target.darwin-arm.mk b/voice_engine/voice_engine.target.darwin-arm.mk index 73b9feef..6b337e33 100644 --- a/voice_engine/voice_engine.target.darwin-arm.mk +++ b/voice_engine/voice_engine.target.darwin-arm.mk @@ -110,6 +110,7 @@ MY_DEFS_Debug := \ '-DENABLE_NOTIFICATIONS' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ + '-DDONT_EMBED_BUILD_METADATA' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ @@ -232,6 +233,7 @@ MY_DEFS_Release := \ '-DENABLE_NOTIFICATIONS' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ + '-DDONT_EMBED_BUILD_METADATA' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ diff --git a/voice_engine/voice_engine.target.darwin-arm64.mk b/voice_engine/voice_engine.target.darwin-arm64.mk index 1937aaeb..1246db1d 100644 --- a/voice_engine/voice_engine.target.darwin-arm64.mk +++ b/voice_engine/voice_engine.target.darwin-arm64.mk @@ -99,6 +99,7 @@ MY_DEFS_Debug := \ '-DENABLE_NOTIFICATIONS' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ + '-DDONT_EMBED_BUILD_METADATA' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ @@ -206,6 +207,7 @@ MY_DEFS_Release := \ '-DENABLE_NOTIFICATIONS' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ + '-DDONT_EMBED_BUILD_METADATA' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ diff --git a/voice_engine/voice_engine.target.darwin-mips.mk b/voice_engine/voice_engine.target.darwin-mips.mk index b558e0d6..213dcf60 100644 --- a/voice_engine/voice_engine.target.darwin-mips.mk +++ b/voice_engine/voice_engine.target.darwin-mips.mk @@ -103,6 +103,7 @@ MY_DEFS_Debug := \ '-DENABLE_NOTIFICATIONS' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ + '-DDONT_EMBED_BUILD_METADATA' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ @@ -217,6 +218,7 @@ MY_DEFS_Release := \ '-DENABLE_NOTIFICATIONS' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ + '-DDONT_EMBED_BUILD_METADATA' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ diff --git a/voice_engine/voice_engine.target.darwin-x86.mk b/voice_engine/voice_engine.target.darwin-x86.mk index 067e1379..0f3f08da 100644 --- a/voice_engine/voice_engine.target.darwin-x86.mk +++ b/voice_engine/voice_engine.target.darwin-x86.mk @@ -105,6 +105,7 @@ MY_DEFS_Debug := \ '-DENABLE_NOTIFICATIONS' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ + '-DDONT_EMBED_BUILD_METADATA' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ @@ -218,6 +219,7 @@ MY_DEFS_Release := \ '-DENABLE_NOTIFICATIONS' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ + '-DDONT_EMBED_BUILD_METADATA' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ diff --git a/voice_engine/voice_engine.target.darwin-x86_64.mk b/voice_engine/voice_engine.target.darwin-x86_64.mk index a9692f44..2e4dd07d 100644 --- a/voice_engine/voice_engine.target.darwin-x86_64.mk +++ b/voice_engine/voice_engine.target.darwin-x86_64.mk @@ -104,6 +104,7 @@ MY_DEFS_Debug := \ '-DENABLE_NOTIFICATIONS' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ + '-DDONT_EMBED_BUILD_METADATA' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ @@ -216,6 +217,7 @@ MY_DEFS_Release := \ '-DENABLE_NOTIFICATIONS' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ + '-DDONT_EMBED_BUILD_METADATA' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ diff --git a/voice_engine/voice_engine.target.linux-arm.mk b/voice_engine/voice_engine.target.linux-arm.mk index 73b9feef..6b337e33 100644 --- a/voice_engine/voice_engine.target.linux-arm.mk +++ b/voice_engine/voice_engine.target.linux-arm.mk @@ -110,6 +110,7 @@ MY_DEFS_Debug := \ '-DENABLE_NOTIFICATIONS' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ + '-DDONT_EMBED_BUILD_METADATA' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ @@ -232,6 +233,7 @@ MY_DEFS_Release := \ '-DENABLE_NOTIFICATIONS' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ + '-DDONT_EMBED_BUILD_METADATA' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ diff --git a/voice_engine/voice_engine.target.linux-arm64.mk b/voice_engine/voice_engine.target.linux-arm64.mk index 1937aaeb..1246db1d 100644 --- a/voice_engine/voice_engine.target.linux-arm64.mk +++ b/voice_engine/voice_engine.target.linux-arm64.mk @@ -99,6 +99,7 @@ MY_DEFS_Debug := \ '-DENABLE_NOTIFICATIONS' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ + '-DDONT_EMBED_BUILD_METADATA' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ @@ -206,6 +207,7 @@ MY_DEFS_Release := \ '-DENABLE_NOTIFICATIONS' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ + '-DDONT_EMBED_BUILD_METADATA' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ diff --git a/voice_engine/voice_engine.target.linux-mips.mk b/voice_engine/voice_engine.target.linux-mips.mk index b558e0d6..213dcf60 100644 --- a/voice_engine/voice_engine.target.linux-mips.mk +++ b/voice_engine/voice_engine.target.linux-mips.mk @@ -103,6 +103,7 @@ MY_DEFS_Debug := \ '-DENABLE_NOTIFICATIONS' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ + '-DDONT_EMBED_BUILD_METADATA' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ @@ -217,6 +218,7 @@ MY_DEFS_Release := \ '-DENABLE_NOTIFICATIONS' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ + '-DDONT_EMBED_BUILD_METADATA' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ diff --git a/voice_engine/voice_engine.target.linux-x86.mk b/voice_engine/voice_engine.target.linux-x86.mk index 067e1379..0f3f08da 100644 --- a/voice_engine/voice_engine.target.linux-x86.mk +++ b/voice_engine/voice_engine.target.linux-x86.mk @@ -105,6 +105,7 @@ MY_DEFS_Debug := \ '-DENABLE_NOTIFICATIONS' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ + '-DDONT_EMBED_BUILD_METADATA' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ @@ -218,6 +219,7 @@ MY_DEFS_Release := \ '-DENABLE_NOTIFICATIONS' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ + '-DDONT_EMBED_BUILD_METADATA' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ diff --git a/voice_engine/voice_engine.target.linux-x86_64.mk b/voice_engine/voice_engine.target.linux-x86_64.mk index a9692f44..2e4dd07d 100644 --- a/voice_engine/voice_engine.target.linux-x86_64.mk +++ b/voice_engine/voice_engine.target.linux-x86_64.mk @@ -104,6 +104,7 @@ MY_DEFS_Debug := \ '-DENABLE_NOTIFICATIONS' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ + '-DDONT_EMBED_BUILD_METADATA' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ @@ -216,6 +217,7 @@ MY_DEFS_Release := \ '-DENABLE_NOTIFICATIONS' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ + '-DDONT_EMBED_BUILD_METADATA' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ |