diff options
author | Android Chromium Automerger <chromium-automerger@android> | 2014-06-09 17:44:56 +0000 |
---|---|---|
committer | Android Chromium Automerger <chromium-automerger@android> | 2014-06-09 17:44:56 +0000 |
commit | 8097a46312f4050f2629558f1d37ec5b3100eb6e (patch) | |
tree | d7571f88cf19a16d4d2c4ab84e561cef93e58c1d /voice_engine | |
parent | 20d9f0061bc129329e0f2900d0c7f9ad500e4c74 (diff) | |
download | webrtc-8097a46312f4050f2629558f1d37ec5b3100eb6e.tar.gz |
Update makefiles after merge of Chromium at 275833
This commit was generated by merge_from_chromium.py.
Change-Id: Iad0f8b40d3547d8d6337888a84071a951f8302d6
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 976138bf..00443bd0 100644 --- a/voice_engine/voice_engine.target.darwin-arm.mk +++ b/voice_engine/voice_engine.target.darwin-arm.mk @@ -314,6 +314,7 @@ LOCAL_LDFLAGS_Debug := \ -fuse-ld=gold \ -nostdlib \ -Wl,--no-undefined \ + -Wl,--exclude-libs=ALL \ -Wl,--icf=safe \ -Wl,--warn-shared-textrel \ -Wl,-O1 \ @@ -331,6 +332,7 @@ LOCAL_LDFLAGS_Release := \ -fuse-ld=gold \ -nostdlib \ -Wl,--no-undefined \ + -Wl,--exclude-libs=ALL \ -Wl,--icf=safe \ -Wl,-O1 \ -Wl,--as-needed \ diff --git a/voice_engine/voice_engine.target.darwin-arm64.mk b/voice_engine/voice_engine.target.darwin-arm64.mk index a92edb3e..4a9758f2 100644 --- a/voice_engine/voice_engine.target.darwin-arm64.mk +++ b/voice_engine/voice_engine.target.darwin-arm64.mk @@ -283,6 +283,7 @@ LOCAL_LDFLAGS_Debug := \ -fPIC \ -nostdlib \ -Wl,--no-undefined \ + -Wl,--exclude-libs=ALL \ -Wl,--warn-shared-textrel \ -Wl,-O1 \ -Wl,--as-needed @@ -296,6 +297,7 @@ LOCAL_LDFLAGS_Release := \ -fPIC \ -nostdlib \ -Wl,--no-undefined \ + -Wl,--exclude-libs=ALL \ -Wl,-O1 \ -Wl,--as-needed \ -Wl,--gc-sections \ diff --git a/voice_engine/voice_engine.target.darwin-mips.mk b/voice_engine/voice_engine.target.darwin-mips.mk index d30ac15e..9280e4bf 100644 --- a/voice_engine/voice_engine.target.darwin-mips.mk +++ b/voice_engine/voice_engine.target.darwin-mips.mk @@ -301,6 +301,7 @@ LOCAL_LDFLAGS_Debug := \ -Wl,--no-keep-memory \ -nostdlib \ -Wl,--no-undefined \ + -Wl,--exclude-libs=ALL \ -Wl,--warn-shared-textrel \ -Wl,-O1 \ -Wl,--as-needed @@ -316,6 +317,7 @@ LOCAL_LDFLAGS_Release := \ -Wl,--no-keep-memory \ -nostdlib \ -Wl,--no-undefined \ + -Wl,--exclude-libs=ALL \ -Wl,-O1 \ -Wl,--as-needed \ -Wl,--gc-sections \ diff --git a/voice_engine/voice_engine.target.darwin-x86.mk b/voice_engine/voice_engine.target.darwin-x86.mk index bcdb8ae5..bf24f0d5 100644 --- a/voice_engine/voice_engine.target.darwin-x86.mk +++ b/voice_engine/voice_engine.target.darwin-x86.mk @@ -295,6 +295,7 @@ LOCAL_LDFLAGS_Debug := \ -fuse-ld=gold \ -nostdlib \ -Wl,--no-undefined \ + -Wl,--exclude-libs=ALL \ -Wl,--warn-shared-textrel \ -Wl,-O1 \ -Wl,--as-needed @@ -310,6 +311,7 @@ LOCAL_LDFLAGS_Release := \ -fuse-ld=gold \ -nostdlib \ -Wl,--no-undefined \ + -Wl,--exclude-libs=ALL \ -Wl,-O1 \ -Wl,--as-needed \ -Wl,--gc-sections \ diff --git a/voice_engine/voice_engine.target.darwin-x86_64.mk b/voice_engine/voice_engine.target.darwin-x86_64.mk index 89703ff3..bf780ba6 100644 --- a/voice_engine/voice_engine.target.darwin-x86_64.mk +++ b/voice_engine/voice_engine.target.darwin-x86_64.mk @@ -293,6 +293,7 @@ LOCAL_LDFLAGS_Debug := \ -fuse-ld=gold \ -nostdlib \ -Wl,--no-undefined \ + -Wl,--exclude-libs=ALL \ -Wl,--warn-shared-textrel \ -Wl,-O1 \ -Wl,--as-needed @@ -308,6 +309,7 @@ LOCAL_LDFLAGS_Release := \ -fuse-ld=gold \ -nostdlib \ -Wl,--no-undefined \ + -Wl,--exclude-libs=ALL \ -Wl,-O1 \ -Wl,--as-needed \ -Wl,--gc-sections \ diff --git a/voice_engine/voice_engine.target.linux-arm.mk b/voice_engine/voice_engine.target.linux-arm.mk index 976138bf..00443bd0 100644 --- a/voice_engine/voice_engine.target.linux-arm.mk +++ b/voice_engine/voice_engine.target.linux-arm.mk @@ -314,6 +314,7 @@ LOCAL_LDFLAGS_Debug := \ -fuse-ld=gold \ -nostdlib \ -Wl,--no-undefined \ + -Wl,--exclude-libs=ALL \ -Wl,--icf=safe \ -Wl,--warn-shared-textrel \ -Wl,-O1 \ @@ -331,6 +332,7 @@ LOCAL_LDFLAGS_Release := \ -fuse-ld=gold \ -nostdlib \ -Wl,--no-undefined \ + -Wl,--exclude-libs=ALL \ -Wl,--icf=safe \ -Wl,-O1 \ -Wl,--as-needed \ diff --git a/voice_engine/voice_engine.target.linux-arm64.mk b/voice_engine/voice_engine.target.linux-arm64.mk index a92edb3e..4a9758f2 100644 --- a/voice_engine/voice_engine.target.linux-arm64.mk +++ b/voice_engine/voice_engine.target.linux-arm64.mk @@ -283,6 +283,7 @@ LOCAL_LDFLAGS_Debug := \ -fPIC \ -nostdlib \ -Wl,--no-undefined \ + -Wl,--exclude-libs=ALL \ -Wl,--warn-shared-textrel \ -Wl,-O1 \ -Wl,--as-needed @@ -296,6 +297,7 @@ LOCAL_LDFLAGS_Release := \ -fPIC \ -nostdlib \ -Wl,--no-undefined \ + -Wl,--exclude-libs=ALL \ -Wl,-O1 \ -Wl,--as-needed \ -Wl,--gc-sections \ diff --git a/voice_engine/voice_engine.target.linux-mips.mk b/voice_engine/voice_engine.target.linux-mips.mk index d30ac15e..9280e4bf 100644 --- a/voice_engine/voice_engine.target.linux-mips.mk +++ b/voice_engine/voice_engine.target.linux-mips.mk @@ -301,6 +301,7 @@ LOCAL_LDFLAGS_Debug := \ -Wl,--no-keep-memory \ -nostdlib \ -Wl,--no-undefined \ + -Wl,--exclude-libs=ALL \ -Wl,--warn-shared-textrel \ -Wl,-O1 \ -Wl,--as-needed @@ -316,6 +317,7 @@ LOCAL_LDFLAGS_Release := \ -Wl,--no-keep-memory \ -nostdlib \ -Wl,--no-undefined \ + -Wl,--exclude-libs=ALL \ -Wl,-O1 \ -Wl,--as-needed \ -Wl,--gc-sections \ diff --git a/voice_engine/voice_engine.target.linux-x86.mk b/voice_engine/voice_engine.target.linux-x86.mk index bcdb8ae5..bf24f0d5 100644 --- a/voice_engine/voice_engine.target.linux-x86.mk +++ b/voice_engine/voice_engine.target.linux-x86.mk @@ -295,6 +295,7 @@ LOCAL_LDFLAGS_Debug := \ -fuse-ld=gold \ -nostdlib \ -Wl,--no-undefined \ + -Wl,--exclude-libs=ALL \ -Wl,--warn-shared-textrel \ -Wl,-O1 \ -Wl,--as-needed @@ -310,6 +311,7 @@ LOCAL_LDFLAGS_Release := \ -fuse-ld=gold \ -nostdlib \ -Wl,--no-undefined \ + -Wl,--exclude-libs=ALL \ -Wl,-O1 \ -Wl,--as-needed \ -Wl,--gc-sections \ diff --git a/voice_engine/voice_engine.target.linux-x86_64.mk b/voice_engine/voice_engine.target.linux-x86_64.mk index 89703ff3..bf780ba6 100644 --- a/voice_engine/voice_engine.target.linux-x86_64.mk +++ b/voice_engine/voice_engine.target.linux-x86_64.mk @@ -293,6 +293,7 @@ LOCAL_LDFLAGS_Debug := \ -fuse-ld=gold \ -nostdlib \ -Wl,--no-undefined \ + -Wl,--exclude-libs=ALL \ -Wl,--warn-shared-textrel \ -Wl,-O1 \ -Wl,--as-needed @@ -308,6 +309,7 @@ LOCAL_LDFLAGS_Release := \ -fuse-ld=gold \ -nostdlib \ -Wl,--no-undefined \ + -Wl,--exclude-libs=ALL \ -Wl,-O1 \ -Wl,--as-needed \ -Wl,--gc-sections \ |