diff options
| author | Ben Murdoch <benm@google.com> | 2014-04-24 10:50:42 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2014-04-24 10:50:42 +0100 |
| commit | 7f71cdff2fb3255a40a70c4431503d4e32e157c6 (patch) | |
| tree | 88a5eb933d77daaf20e0d5ba3c37bdbd9ebc3e06 | |
| parent | d7624e6e53e112a757813f4c9a9057267032bb5b (diff) | |
| parent | 39ef1471166dd0c251bd02f343b24187a7a22e27 (diff) | |
| download | libsrtp-7f71cdff2fb3255a40a70c4431503d4e32e157c6.tar.gz | |
Merge from Chromium at DEPS revision 265802
This commit was generated by merge_to_master.py.
Change-Id: I6c246a8490f3dcd3a873c1ff7469bbe079871f1b
| -rw-r--r-- | libsrtp.target.darwin-arm.mk | 1 | ||||
| -rw-r--r-- | libsrtp.target.darwin-mips.mk | 1 | ||||
| -rw-r--r-- | libsrtp.target.darwin-x86.mk | 1 | ||||
| -rw-r--r-- | libsrtp.target.darwin-x86_64.mk | 1 | ||||
| -rw-r--r-- | libsrtp.target.linux-arm.mk | 1 | ||||
| -rw-r--r-- | libsrtp.target.linux-mips.mk | 1 | ||||
| -rw-r--r-- | libsrtp.target.linux-x86.mk | 1 | ||||
| -rw-r--r-- | libsrtp.target.linux-x86_64.mk | 1 |
8 files changed, 0 insertions, 8 deletions
diff --git a/libsrtp.target.darwin-arm.mk b/libsrtp.target.darwin-arm.mk index 2c26006..3ab8dbd 100644 --- a/libsrtp.target.darwin-arm.mk +++ b/libsrtp.target.darwin-arm.mk @@ -274,7 +274,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/libsrtp.target.darwin-mips.mk b/libsrtp.target.darwin-mips.mk index 8f55ee4..998254c 100644 --- a/libsrtp.target.darwin-mips.mk +++ b/libsrtp.target.darwin-mips.mk @@ -272,7 +272,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/libsrtp.target.darwin-x86.mk b/libsrtp.target.darwin-x86.mk index 7061a72..4206f39 100644 --- a/libsrtp.target.darwin-x86.mk +++ b/libsrtp.target.darwin-x86.mk @@ -272,7 +272,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/libsrtp.target.darwin-x86_64.mk b/libsrtp.target.darwin-x86_64.mk index b2bd0cd..80958fe 100644 --- a/libsrtp.target.darwin-x86_64.mk +++ b/libsrtp.target.darwin-x86_64.mk @@ -272,7 +272,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/libsrtp.target.linux-arm.mk b/libsrtp.target.linux-arm.mk index 2c26006..3ab8dbd 100644 --- a/libsrtp.target.linux-arm.mk +++ b/libsrtp.target.linux-arm.mk @@ -274,7 +274,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/libsrtp.target.linux-mips.mk b/libsrtp.target.linux-mips.mk index 8f55ee4..998254c 100644 --- a/libsrtp.target.linux-mips.mk +++ b/libsrtp.target.linux-mips.mk @@ -272,7 +272,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/libsrtp.target.linux-x86.mk b/libsrtp.target.linux-x86.mk index 7061a72..4206f39 100644 --- a/libsrtp.target.linux-x86.mk +++ b/libsrtp.target.linux-x86.mk @@ -272,7 +272,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/libsrtp.target.linux-x86_64.mk b/libsrtp.target.linux-x86_64.mk index b2bd0cd..80958fe 100644 --- a/libsrtp.target.linux-x86_64.mk +++ b/libsrtp.target.linux-x86_64.mk @@ -272,7 +272,6 @@ LOCAL_LDFLAGS_Debug := \ -nostdlib \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ - -Wl,--gc-sections \ -Wl,--warn-shared-textrel \ -Wl,-O1 \ -Wl,--as-needed |