From 39ef1471166dd0c251bd02f343b24187a7a22e27 Mon Sep 17 00:00:00 2001 From: Android Chromium Automerger Date: Wed, 23 Apr 2014 17:57:39 +0000 Subject: Update makefiles after merge of Chromium at 265680 This commit was generated by merge_from_chromium.py. Change-Id: Iae50797e70935c8741dac8fc89f113172f75cf13 --- libsrtp.target.darwin-arm.mk | 1 - libsrtp.target.darwin-mips.mk | 1 - libsrtp.target.darwin-x86.mk | 1 - libsrtp.target.darwin-x86_64.mk | 1 - libsrtp.target.linux-arm.mk | 1 - libsrtp.target.linux-mips.mk | 1 - libsrtp.target.linux-x86.mk | 1 - libsrtp.target.linux-x86_64.mk | 1 - 8 files changed, 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 -- cgit v1.2.3