Merge from Chromium at DEPS revision 37.0.2062.21
This commit was generated by merge_to_master.py.
Change-Id: I6fde708906455ee7af76ca8308dbe7b0ed19b6d2
diff --git a/dl/openmax_dl.target.darwin-arm.mk b/dl/openmax_dl.target.darwin-arm.mk
index 64c297c..3cd45e7 100644
--- a/dl/openmax_dl.target.darwin-arm.mk
+++ b/dl/openmax_dl.target.darwin-arm.mk
@@ -120,9 +120,9 @@
-Wno-sequence-point \
-Os \
-g \
- -fomit-frame-pointer \
-fdata-sections \
-ffunction-sections \
+ -fomit-frame-pointer \
-funwind-tables
MY_DEFS_Debug := \
diff --git a/dl/openmax_dl.target.darwin-arm64.mk b/dl/openmax_dl.target.darwin-arm64.mk
index 9aba075..3d79810 100644
--- a/dl/openmax_dl.target.darwin-arm64.mk
+++ b/dl/openmax_dl.target.darwin-arm64.mk
@@ -75,7 +75,6 @@
-Wno-sequence-point \
-Os \
-g \
- -fomit-frame-pointer \
-fdata-sections \
-ffunction-sections \
-funwind-tables
@@ -168,7 +167,6 @@
-fno-ident \
-fdata-sections \
-ffunction-sections \
- -fomit-frame-pointer \
-funwind-tables
MY_DEFS_Release := \
diff --git a/dl/openmax_dl.target.darwin-mips.mk b/dl/openmax_dl.target.darwin-mips.mk
index 895dd93..27fca8a 100644
--- a/dl/openmax_dl.target.darwin-mips.mk
+++ b/dl/openmax_dl.target.darwin-mips.mk
@@ -69,9 +69,9 @@
-Wno-sequence-point \
-Os \
-g \
- -fomit-frame-pointer \
-fdata-sections \
-ffunction-sections \
+ -fomit-frame-pointer \
-funwind-tables
MY_DEFS_Debug := \
diff --git a/dl/openmax_dl.target.darwin-x86.mk b/dl/openmax_dl.target.darwin-x86.mk
index 9357ded..52fbc2b 100644
--- a/dl/openmax_dl.target.darwin-x86.mk
+++ b/dl/openmax_dl.target.darwin-x86.mk
@@ -87,9 +87,9 @@
-Wno-sequence-point \
-Os \
-g \
- -fomit-frame-pointer \
-fdata-sections \
-ffunction-sections \
+ -fomit-frame-pointer \
-funwind-tables
MY_DEFS_Debug := \
diff --git a/dl/openmax_dl.target.darwin-x86_64.mk b/dl/openmax_dl.target.darwin-x86_64.mk
index 7af09d0..6d3f9f4 100644
--- a/dl/openmax_dl.target.darwin-x86_64.mk
+++ b/dl/openmax_dl.target.darwin-x86_64.mk
@@ -86,9 +86,9 @@
-Wno-sequence-point \
-Os \
-g \
- -fomit-frame-pointer \
-fdata-sections \
-ffunction-sections \
+ -fomit-frame-pointer \
-funwind-tables
MY_DEFS_Debug := \
diff --git a/dl/openmax_dl.target.linux-arm.mk b/dl/openmax_dl.target.linux-arm.mk
index 64c297c..3cd45e7 100644
--- a/dl/openmax_dl.target.linux-arm.mk
+++ b/dl/openmax_dl.target.linux-arm.mk
@@ -120,9 +120,9 @@
-Wno-sequence-point \
-Os \
-g \
- -fomit-frame-pointer \
-fdata-sections \
-ffunction-sections \
+ -fomit-frame-pointer \
-funwind-tables
MY_DEFS_Debug := \
diff --git a/dl/openmax_dl.target.linux-arm64.mk b/dl/openmax_dl.target.linux-arm64.mk
index 9aba075..3d79810 100644
--- a/dl/openmax_dl.target.linux-arm64.mk
+++ b/dl/openmax_dl.target.linux-arm64.mk
@@ -75,7 +75,6 @@
-Wno-sequence-point \
-Os \
-g \
- -fomit-frame-pointer \
-fdata-sections \
-ffunction-sections \
-funwind-tables
@@ -168,7 +167,6 @@
-fno-ident \
-fdata-sections \
-ffunction-sections \
- -fomit-frame-pointer \
-funwind-tables
MY_DEFS_Release := \
diff --git a/dl/openmax_dl.target.linux-mips.mk b/dl/openmax_dl.target.linux-mips.mk
index 895dd93..27fca8a 100644
--- a/dl/openmax_dl.target.linux-mips.mk
+++ b/dl/openmax_dl.target.linux-mips.mk
@@ -69,9 +69,9 @@
-Wno-sequence-point \
-Os \
-g \
- -fomit-frame-pointer \
-fdata-sections \
-ffunction-sections \
+ -fomit-frame-pointer \
-funwind-tables
MY_DEFS_Debug := \
diff --git a/dl/openmax_dl.target.linux-x86.mk b/dl/openmax_dl.target.linux-x86.mk
index 9357ded..52fbc2b 100644
--- a/dl/openmax_dl.target.linux-x86.mk
+++ b/dl/openmax_dl.target.linux-x86.mk
@@ -87,9 +87,9 @@
-Wno-sequence-point \
-Os \
-g \
- -fomit-frame-pointer \
-fdata-sections \
-ffunction-sections \
+ -fomit-frame-pointer \
-funwind-tables
MY_DEFS_Debug := \
diff --git a/dl/openmax_dl.target.linux-x86_64.mk b/dl/openmax_dl.target.linux-x86_64.mk
index 7af09d0..6d3f9f4 100644
--- a/dl/openmax_dl.target.linux-x86_64.mk
+++ b/dl/openmax_dl.target.linux-x86_64.mk
@@ -86,9 +86,9 @@
-Wno-sequence-point \
-Os \
-g \
- -fomit-frame-pointer \
-fdata-sections \
-ffunction-sections \
+ -fomit-frame-pointer \
-funwind-tables
MY_DEFS_Debug := \
diff --git a/dl/openmax_dl_armv7.target.darwin-arm.mk b/dl/openmax_dl_armv7.target.darwin-arm.mk
index 9cb4963..c083bfd 100644
--- a/dl/openmax_dl_armv7.target.darwin-arm.mk
+++ b/dl/openmax_dl_armv7.target.darwin-arm.mk
@@ -74,9 +74,9 @@
-Wno-sequence-point \
-Os \
-g \
- -fomit-frame-pointer \
-fdata-sections \
-ffunction-sections \
+ -fomit-frame-pointer \
-funwind-tables
MY_DEFS_Debug := \
diff --git a/dl/openmax_dl_armv7.target.linux-arm.mk b/dl/openmax_dl_armv7.target.linux-arm.mk
index 9cb4963..c083bfd 100644
--- a/dl/openmax_dl_armv7.target.linux-arm.mk
+++ b/dl/openmax_dl_armv7.target.linux-arm.mk
@@ -74,9 +74,9 @@
-Wno-sequence-point \
-Os \
-g \
- -fomit-frame-pointer \
-fdata-sections \
-ffunction-sections \
+ -fomit-frame-pointer \
-funwind-tables
MY_DEFS_Debug := \
