commit 7d3be9fc4a89d32486b9c443cf821b67056c383c
author Android Chromium Automerger <chromium-automerger@android> Tue Sep 09 10:35:00 2014 +0000
committer Android Chromium Automerger <chromium-automerger@android> Tue Sep 09 10:35:00 2014 +0000
tree 1172575beb49cee87af10b4faba2670b5eec2137
parent 82e4bf1e8184a75721cc7efccf4d03b36a3ba36b

Update makefiles after merge of Chromium at 457b0a1c9412

This commit was generated by merge_from_chromium.py.

Change-Id: Ia5d9d6271f693ea54779045d0e710e407e5f985d

libsrtp.target.darwin-arm.mk

diff --git a/libsrtp.target.darwin-arm.mk b/libsrtp.target.darwin-arm.mk
index aa16133..0d428b0 100644
--- a/libsrtp.target.darwin-arm.mk
+++ b/libsrtp.target.darwin-arm.mk
@@ -63,11 +63,6 @@
 	-Wno-unused-local-typedefs \
 	-Wno-format \
 	-fno-tree-sra \
-	-fno-partial-inlining \
-	-fno-early-inlining \
-	-fno-tree-copy-prop \
-	-fno-tree-loop-optimize \
-	-fno-move-loop-invariants \
 	-fno-caller-saves \
 	-Wno-psabi \
 	-ffunction-sections \
@@ -182,11 +177,6 @@
 	-Wno-unused-local-typedefs \
 	-Wno-format \
 	-fno-tree-sra \
-	-fno-partial-inlining \
-	-fno-early-inlining \
-	-fno-tree-copy-prop \
-	-fno-tree-loop-optimize \
-	-fno-move-loop-invariants \
 	-fno-caller-saves \
 	-Wno-psabi \
 	-ffunction-sections \

libsrtp.target.linux-arm.mk

diff --git a/libsrtp.target.linux-arm.mk b/libsrtp.target.linux-arm.mk
index aa16133..0d428b0 100644
--- a/libsrtp.target.linux-arm.mk
+++ b/libsrtp.target.linux-arm.mk
@@ -63,11 +63,6 @@
 	-Wno-unused-local-typedefs \
 	-Wno-format \
 	-fno-tree-sra \
-	-fno-partial-inlining \
-	-fno-early-inlining \
-	-fno-tree-copy-prop \
-	-fno-tree-loop-optimize \
-	-fno-move-loop-invariants \
 	-fno-caller-saves \
 	-Wno-psabi \
 	-ffunction-sections \
@@ -182,11 +177,6 @@
 	-Wno-unused-local-typedefs \
 	-Wno-format \
 	-fno-tree-sra \
-	-fno-partial-inlining \
-	-fno-early-inlining \
-	-fno-tree-copy-prop \
-	-fno-tree-loop-optimize \
-	-fno-move-loop-invariants \
 	-fno-caller-saves \
 	-Wno-psabi \
 	-ffunction-sections \