diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-07-10 18:45:25 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-07-10 18:45:25 +0000 |
| commit | 7aaed37d68bb50bf7f62bf8a3341304dea920fcd (patch) | |
| tree | bcb316f743aac99a73e72dc3dadaf190de826f24 | |
| parent | e4b3db234d61d9d10e8e79dca36de73c1e92804a (diff) | |
| download | ots-7aaed37d68bb50bf7f62bf8a3341304dea920fcd.tar.gz | |
Update makefiles after merge of Chromium at 282385
This commit was generated by merge_from_chromium.py.
Change-Id: Id1f5f74c0daca27c9856f6d3ffb1e0543083237f
| -rw-r--r-- | ots.target.darwin-arm.mk | 2 | ||||
| -rw-r--r-- | ots.target.darwin-arm64.mk | 2 | ||||
| -rw-r--r-- | ots.target.darwin-mips.mk | 2 | ||||
| -rw-r--r-- | ots.target.darwin-x86.mk | 2 | ||||
| -rw-r--r-- | ots.target.darwin-x86_64.mk | 2 | ||||
| -rw-r--r-- | ots.target.linux-arm.mk | 2 | ||||
| -rw-r--r-- | ots.target.linux-arm64.mk | 2 | ||||
| -rw-r--r-- | ots.target.linux-mips.mk | 2 | ||||
| -rw-r--r-- | ots.target.linux-x86.mk | 2 | ||||
| -rw-r--r-- | ots.target.linux-x86_64.mk | 2 |
10 files changed, 8 insertions, 12 deletions
diff --git a/ots.target.darwin-arm.mk b/ots.target.darwin-arm.mk index 5d84ff9..9595d64 100644 --- a/ots.target.darwin-arm.mk +++ b/ots.target.darwin-arm.mk @@ -95,9 +95,9 @@ MY_CFLAGS_Debug := \ -Wno-unused-but-set-variable \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ + -fomit-frame-pointer \ -funwind-tables MY_DEFS_Debug := \ diff --git a/ots.target.darwin-arm64.mk b/ots.target.darwin-arm64.mk index 87c14b5..a33d9e7 100644 --- a/ots.target.darwin-arm64.mk +++ b/ots.target.darwin-arm64.mk @@ -85,7 +85,6 @@ MY_CFLAGS_Debug := \ -Wno-unused-but-set-variable \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ -funwind-tables @@ -181,7 +180,6 @@ MY_CFLAGS_Release := \ -fno-ident \ -fdata-sections \ -ffunction-sections \ - -fomit-frame-pointer \ -funwind-tables MY_DEFS_Release := \ diff --git a/ots.target.darwin-mips.mk b/ots.target.darwin-mips.mk index e28a122..c101579 100644 --- a/ots.target.darwin-mips.mk +++ b/ots.target.darwin-mips.mk @@ -89,9 +89,9 @@ MY_CFLAGS_Debug := \ -Wno-unused-but-set-variable \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ + -fomit-frame-pointer \ -funwind-tables MY_DEFS_Debug := \ diff --git a/ots.target.darwin-x86.mk b/ots.target.darwin-x86.mk index f68873f..556e66f 100644 --- a/ots.target.darwin-x86.mk +++ b/ots.target.darwin-x86.mk @@ -90,9 +90,9 @@ MY_CFLAGS_Debug := \ -fno-stack-protector \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ + -fomit-frame-pointer \ -funwind-tables MY_DEFS_Debug := \ diff --git a/ots.target.darwin-x86_64.mk b/ots.target.darwin-x86_64.mk index 6e6a488..76693f1 100644 --- a/ots.target.darwin-x86_64.mk +++ b/ots.target.darwin-x86_64.mk @@ -89,9 +89,9 @@ MY_CFLAGS_Debug := \ -Wno-unused-but-set-variable \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ + -fomit-frame-pointer \ -funwind-tables MY_DEFS_Debug := \ diff --git a/ots.target.linux-arm.mk b/ots.target.linux-arm.mk index 5d84ff9..9595d64 100644 --- a/ots.target.linux-arm.mk +++ b/ots.target.linux-arm.mk @@ -95,9 +95,9 @@ MY_CFLAGS_Debug := \ -Wno-unused-but-set-variable \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ + -fomit-frame-pointer \ -funwind-tables MY_DEFS_Debug := \ diff --git a/ots.target.linux-arm64.mk b/ots.target.linux-arm64.mk index 87c14b5..a33d9e7 100644 --- a/ots.target.linux-arm64.mk +++ b/ots.target.linux-arm64.mk @@ -85,7 +85,6 @@ MY_CFLAGS_Debug := \ -Wno-unused-but-set-variable \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ -funwind-tables @@ -181,7 +180,6 @@ MY_CFLAGS_Release := \ -fno-ident \ -fdata-sections \ -ffunction-sections \ - -fomit-frame-pointer \ -funwind-tables MY_DEFS_Release := \ diff --git a/ots.target.linux-mips.mk b/ots.target.linux-mips.mk index e28a122..c101579 100644 --- a/ots.target.linux-mips.mk +++ b/ots.target.linux-mips.mk @@ -89,9 +89,9 @@ MY_CFLAGS_Debug := \ -Wno-unused-but-set-variable \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ + -fomit-frame-pointer \ -funwind-tables MY_DEFS_Debug := \ diff --git a/ots.target.linux-x86.mk b/ots.target.linux-x86.mk index f68873f..556e66f 100644 --- a/ots.target.linux-x86.mk +++ b/ots.target.linux-x86.mk @@ -90,9 +90,9 @@ MY_CFLAGS_Debug := \ -fno-stack-protector \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ + -fomit-frame-pointer \ -funwind-tables MY_DEFS_Debug := \ diff --git a/ots.target.linux-x86_64.mk b/ots.target.linux-x86_64.mk index 6e6a488..76693f1 100644 --- a/ots.target.linux-x86_64.mk +++ b/ots.target.linux-x86_64.mk @@ -89,9 +89,9 @@ MY_CFLAGS_Debug := \ -Wno-unused-but-set-variable \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ + -fomit-frame-pointer \ -funwind-tables MY_DEFS_Debug := \ |