diff options
author | Android Chromium Automerger <chromium-automerger@android> | 2014-04-23 17:57:41 +0000 |
---|---|---|
committer | Android Chromium Automerger <chromium-automerger@android> | 2014-04-23 17:57:41 +0000 |
commit | c71e133c4d4edcac2469c51d35e592e6a940027a (patch) | |
tree | 89958ecb62068f83d7c78da9d77584928f0150ef | |
parent | adac849bac06b91581279c9dd7e09307fc067894 (diff) | |
download | ots-c71e133c4d4edcac2469c51d35e592e6a940027a.tar.gz |
Update makefiles after merge of Chromium at 265680
This commit was generated by merge_from_chromium.py.
Change-Id: Ic55ecac3bc2c50f2c6acd74879b9dfec23da0442
-rw-r--r-- | ots.target.darwin-arm.mk | 1 | ||||
-rw-r--r-- | ots.target.darwin-mips.mk | 1 | ||||
-rw-r--r-- | ots.target.darwin-x86.mk | 1 | ||||
-rw-r--r-- | ots.target.darwin-x86_64.mk | 1 | ||||
-rw-r--r-- | ots.target.linux-arm.mk | 1 | ||||
-rw-r--r-- | ots.target.linux-mips.mk | 1 | ||||
-rw-r--r-- | ots.target.linux-x86.mk | 1 | ||||
-rw-r--r-- | ots.target.linux-x86_64.mk | 1 |
8 files changed, 0 insertions, 8 deletions
diff --git a/ots.target.darwin-arm.mk b/ots.target.darwin-arm.mk index 3df008c..19f99e7 100644 --- a/ots.target.darwin-arm.mk +++ b/ots.target.darwin-arm.mk @@ -251,7 +251,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/ots.target.darwin-mips.mk b/ots.target.darwin-mips.mk index 9e483ae..9e8eb71 100644 --- a/ots.target.darwin-mips.mk +++ b/ots.target.darwin-mips.mk @@ -247,7 +247,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/ots.target.darwin-x86.mk b/ots.target.darwin-x86.mk index 6d04176..06122db 100644 --- a/ots.target.darwin-x86.mk +++ b/ots.target.darwin-x86.mk @@ -249,7 +249,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/ots.target.darwin-x86_64.mk b/ots.target.darwin-x86_64.mk index f9854fe..8696a78 100644 --- a/ots.target.darwin-x86_64.mk +++ b/ots.target.darwin-x86_64.mk @@ -249,7 +249,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/ots.target.linux-arm.mk b/ots.target.linux-arm.mk index 3df008c..19f99e7 100644 --- a/ots.target.linux-arm.mk +++ b/ots.target.linux-arm.mk @@ -251,7 +251,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/ots.target.linux-mips.mk b/ots.target.linux-mips.mk index 9e483ae..9e8eb71 100644 --- a/ots.target.linux-mips.mk +++ b/ots.target.linux-mips.mk @@ -247,7 +247,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/ots.target.linux-x86.mk b/ots.target.linux-x86.mk index 6d04176..06122db 100644 --- a/ots.target.linux-x86.mk +++ b/ots.target.linux-x86.mk @@ -249,7 +249,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/ots.target.linux-x86_64.mk b/ots.target.linux-x86_64.mk index f9854fe..8696a78 100644 --- a/ots.target.linux-x86_64.mk +++ b/ots.target.linux-x86_64.mk @@ -249,7 +249,6 @@ LOCAL_LDFLAGS_Debug := \ -nostdlib \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ - -Wl,--gc-sections \ -Wl,--warn-shared-textrel \ -Wl,-O1 \ -Wl,--as-needed |