diff options
author | Android Chromium Automerger <chromium-automerger@android> | 2014-04-23 17:57:43 +0000 |
---|---|---|
committer | Android Chromium Automerger <chromium-automerger@android> | 2014-04-23 17:57:43 +0000 |
commit | 0197db216ebd869ca02996b4d13d2b81a03d0b8d (patch) | |
tree | 02c4c27820121c5586b92cc9de39ea310b6de5df /modules/video_coding | |
parent | 91734bd0ab266982b374f554196e6be3882326d8 (diff) | |
download | webrtc-0197db216ebd869ca02996b4d13d2b81a03d0b8d.tar.gz |
Update makefiles after merge of Chromium at 265680
This commit was generated by merge_from_chromium.py.
Change-Id: I84b2c1e1aba49107ed10312709f3b081168a3965
Diffstat (limited to 'modules/video_coding')
16 files changed, 0 insertions, 16 deletions
diff --git a/modules/video_coding/codecs/vp8/webrtc_vp8.target.darwin-arm.mk b/modules/video_coding/codecs/vp8/webrtc_vp8.target.darwin-arm.mk index a2aeab86..93598e2c 100644 --- a/modules/video_coding/codecs/vp8/webrtc_vp8.target.darwin-arm.mk +++ b/modules/video_coding/codecs/vp8/webrtc_vp8.target.darwin-arm.mk @@ -259,7 +259,6 @@ LOCAL_LDFLAGS_Debug := \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ -Wl,--icf=safe \ - -Wl,--gc-sections \ -Wl,--warn-shared-textrel \ -Wl,-O1 \ -Wl,--as-needed diff --git a/modules/video_coding/codecs/vp8/webrtc_vp8.target.darwin-mips.mk b/modules/video_coding/codecs/vp8/webrtc_vp8.target.darwin-mips.mk index 9de713ee..5e38a2bd 100644 --- a/modules/video_coding/codecs/vp8/webrtc_vp8.target.darwin-mips.mk +++ b/modules/video_coding/codecs/vp8/webrtc_vp8.target.darwin-mips.mk @@ -255,7 +255,6 @@ LOCAL_LDFLAGS_Debug := \ -nostdlib \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ - -Wl,--gc-sections \ -Wl,--warn-shared-textrel \ -Wl,-O1 \ -Wl,--as-needed diff --git a/modules/video_coding/codecs/vp8/webrtc_vp8.target.darwin-x86.mk b/modules/video_coding/codecs/vp8/webrtc_vp8.target.darwin-x86.mk index 2f4bda8d..9a8ac438 100644 --- a/modules/video_coding/codecs/vp8/webrtc_vp8.target.darwin-x86.mk +++ b/modules/video_coding/codecs/vp8/webrtc_vp8.target.darwin-x86.mk @@ -251,7 +251,6 @@ LOCAL_LDFLAGS_Debug := \ -nostdlib \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ - -Wl,--gc-sections \ -Wl,--warn-shared-textrel \ -Wl,-O1 \ -Wl,--as-needed diff --git a/modules/video_coding/codecs/vp8/webrtc_vp8.target.darwin-x86_64.mk b/modules/video_coding/codecs/vp8/webrtc_vp8.target.darwin-x86_64.mk index f6517d91..188a9717 100644 --- a/modules/video_coding/codecs/vp8/webrtc_vp8.target.darwin-x86_64.mk +++ b/modules/video_coding/codecs/vp8/webrtc_vp8.target.darwin-x86_64.mk @@ -251,7 +251,6 @@ LOCAL_LDFLAGS_Debug := \ -nostdlib \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ - -Wl,--gc-sections \ -Wl,--warn-shared-textrel \ -Wl,-O1 \ -Wl,--as-needed diff --git a/modules/video_coding/codecs/vp8/webrtc_vp8.target.linux-arm.mk b/modules/video_coding/codecs/vp8/webrtc_vp8.target.linux-arm.mk index a2aeab86..93598e2c 100644 --- a/modules/video_coding/codecs/vp8/webrtc_vp8.target.linux-arm.mk +++ b/modules/video_coding/codecs/vp8/webrtc_vp8.target.linux-arm.mk @@ -259,7 +259,6 @@ LOCAL_LDFLAGS_Debug := \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ -Wl,--icf=safe \ - -Wl,--gc-sections \ -Wl,--warn-shared-textrel \ -Wl,-O1 \ -Wl,--as-needed diff --git a/modules/video_coding/codecs/vp8/webrtc_vp8.target.linux-mips.mk b/modules/video_coding/codecs/vp8/webrtc_vp8.target.linux-mips.mk index 9de713ee..5e38a2bd 100644 --- a/modules/video_coding/codecs/vp8/webrtc_vp8.target.linux-mips.mk +++ b/modules/video_coding/codecs/vp8/webrtc_vp8.target.linux-mips.mk @@ -255,7 +255,6 @@ LOCAL_LDFLAGS_Debug := \ -nostdlib \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ - -Wl,--gc-sections \ -Wl,--warn-shared-textrel \ -Wl,-O1 \ -Wl,--as-needed diff --git a/modules/video_coding/codecs/vp8/webrtc_vp8.target.linux-x86.mk b/modules/video_coding/codecs/vp8/webrtc_vp8.target.linux-x86.mk index 2f4bda8d..9a8ac438 100644 --- a/modules/video_coding/codecs/vp8/webrtc_vp8.target.linux-x86.mk +++ b/modules/video_coding/codecs/vp8/webrtc_vp8.target.linux-x86.mk @@ -251,7 +251,6 @@ LOCAL_LDFLAGS_Debug := \ -nostdlib \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ - -Wl,--gc-sections \ -Wl,--warn-shared-textrel \ -Wl,-O1 \ -Wl,--as-needed diff --git a/modules/video_coding/codecs/vp8/webrtc_vp8.target.linux-x86_64.mk b/modules/video_coding/codecs/vp8/webrtc_vp8.target.linux-x86_64.mk index f6517d91..188a9717 100644 --- a/modules/video_coding/codecs/vp8/webrtc_vp8.target.linux-x86_64.mk +++ b/modules/video_coding/codecs/vp8/webrtc_vp8.target.linux-x86_64.mk @@ -251,7 +251,6 @@ LOCAL_LDFLAGS_Debug := \ -nostdlib \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ - -Wl,--gc-sections \ -Wl,--warn-shared-textrel \ -Wl,-O1 \ -Wl,--as-needed diff --git a/modules/video_coding/utility/video_coding_utility.target.darwin-arm.mk b/modules/video_coding/utility/video_coding_utility.target.darwin-arm.mk index a1cf4dfc..4c27eb55 100644 --- a/modules/video_coding/utility/video_coding_utility.target.darwin-arm.mk +++ b/modules/video_coding/utility/video_coding_utility.target.darwin-arm.mk @@ -250,7 +250,6 @@ LOCAL_LDFLAGS_Debug := \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ -Wl,--icf=safe \ - -Wl,--gc-sections \ -Wl,--warn-shared-textrel \ -Wl,-O1 \ -Wl,--as-needed diff --git a/modules/video_coding/utility/video_coding_utility.target.darwin-mips.mk b/modules/video_coding/utility/video_coding_utility.target.darwin-mips.mk index 406d02f7..2372517c 100644 --- a/modules/video_coding/utility/video_coding_utility.target.darwin-mips.mk +++ b/modules/video_coding/utility/video_coding_utility.target.darwin-mips.mk @@ -246,7 +246,6 @@ LOCAL_LDFLAGS_Debug := \ -nostdlib \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ - -Wl,--gc-sections \ -Wl,--warn-shared-textrel \ -Wl,-O1 \ -Wl,--as-needed diff --git a/modules/video_coding/utility/video_coding_utility.target.darwin-x86.mk b/modules/video_coding/utility/video_coding_utility.target.darwin-x86.mk index 6ba4d813..8d885de4 100644 --- a/modules/video_coding/utility/video_coding_utility.target.darwin-x86.mk +++ b/modules/video_coding/utility/video_coding_utility.target.darwin-x86.mk @@ -242,7 +242,6 @@ LOCAL_LDFLAGS_Debug := \ -nostdlib \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ - -Wl,--gc-sections \ -Wl,--warn-shared-textrel \ -Wl,-O1 \ -Wl,--as-needed diff --git a/modules/video_coding/utility/video_coding_utility.target.darwin-x86_64.mk b/modules/video_coding/utility/video_coding_utility.target.darwin-x86_64.mk index 7a10e7e0..18d26dc4 100644 --- a/modules/video_coding/utility/video_coding_utility.target.darwin-x86_64.mk +++ b/modules/video_coding/utility/video_coding_utility.target.darwin-x86_64.mk @@ -242,7 +242,6 @@ LOCAL_LDFLAGS_Debug := \ -nostdlib \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ - -Wl,--gc-sections \ -Wl,--warn-shared-textrel \ -Wl,-O1 \ -Wl,--as-needed diff --git a/modules/video_coding/utility/video_coding_utility.target.linux-arm.mk b/modules/video_coding/utility/video_coding_utility.target.linux-arm.mk index a1cf4dfc..4c27eb55 100644 --- a/modules/video_coding/utility/video_coding_utility.target.linux-arm.mk +++ b/modules/video_coding/utility/video_coding_utility.target.linux-arm.mk @@ -250,7 +250,6 @@ LOCAL_LDFLAGS_Debug := \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ -Wl,--icf=safe \ - -Wl,--gc-sections \ -Wl,--warn-shared-textrel \ -Wl,-O1 \ -Wl,--as-needed diff --git a/modules/video_coding/utility/video_coding_utility.target.linux-mips.mk b/modules/video_coding/utility/video_coding_utility.target.linux-mips.mk index 406d02f7..2372517c 100644 --- a/modules/video_coding/utility/video_coding_utility.target.linux-mips.mk +++ b/modules/video_coding/utility/video_coding_utility.target.linux-mips.mk @@ -246,7 +246,6 @@ LOCAL_LDFLAGS_Debug := \ -nostdlib \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ - -Wl,--gc-sections \ -Wl,--warn-shared-textrel \ -Wl,-O1 \ -Wl,--as-needed diff --git a/modules/video_coding/utility/video_coding_utility.target.linux-x86.mk b/modules/video_coding/utility/video_coding_utility.target.linux-x86.mk index 6ba4d813..8d885de4 100644 --- a/modules/video_coding/utility/video_coding_utility.target.linux-x86.mk +++ b/modules/video_coding/utility/video_coding_utility.target.linux-x86.mk @@ -242,7 +242,6 @@ LOCAL_LDFLAGS_Debug := \ -nostdlib \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ - -Wl,--gc-sections \ -Wl,--warn-shared-textrel \ -Wl,-O1 \ -Wl,--as-needed diff --git a/modules/video_coding/utility/video_coding_utility.target.linux-x86_64.mk b/modules/video_coding/utility/video_coding_utility.target.linux-x86_64.mk index 7a10e7e0..18d26dc4 100644 --- a/modules/video_coding/utility/video_coding_utility.target.linux-x86_64.mk +++ b/modules/video_coding/utility/video_coding_utility.target.linux-x86_64.mk @@ -242,7 +242,6 @@ LOCAL_LDFLAGS_Debug := \ -nostdlib \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ - -Wl,--gc-sections \ -Wl,--warn-shared-textrel \ -Wl,-O1 \ -Wl,--as-needed |