From 16bc225f6c98edf2070af454a67ae14a06038acf Mon Sep 17 00:00:00 2001 From: Android Chromium Automerger Date: Fri, 8 Nov 2013 12:46:38 +0000 Subject: Update makefiles after merge of Chromium at 233887 This commit was generated by merge_from_chromium.py. Change-Id: Iea787c967188f24f3cd62597201325e130a97724 --- openssl.target.darwin-arm.mk | 2 ++ openssl.target.darwin-mips.mk | 2 ++ openssl.target.darwin-x86.mk | 2 ++ openssl.target.linux-arm.mk | 2 ++ openssl.target.linux-mips.mk | 2 ++ openssl.target.linux-x86.mk | 2 ++ 6 files changed, 12 insertions(+) diff --git a/openssl.target.darwin-arm.mk b/openssl.target.darwin-arm.mk index 163c72c..0451d76 100644 --- a/openssl.target.darwin-arm.mk +++ b/openssl.target.darwin-arm.mk @@ -588,6 +588,7 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -g \ -w \ -Wno-format \ -fno-tree-sra \ @@ -686,6 +687,7 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -g \ -w \ -Wno-format \ -fno-tree-sra \ diff --git a/openssl.target.darwin-mips.mk b/openssl.target.darwin-mips.mk index 1589f13..9a3ac9c 100644 --- a/openssl.target.darwin-mips.mk +++ b/openssl.target.darwin-mips.mk @@ -586,6 +586,7 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -g \ -w \ -Wno-format \ -EL \ @@ -681,6 +682,7 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -g \ -w \ -Wno-format \ -EL \ diff --git a/openssl.target.darwin-x86.mk b/openssl.target.darwin-x86.mk index 845a045..28850f7 100644 --- a/openssl.target.darwin-x86.mk +++ b/openssl.target.darwin-x86.mk @@ -590,6 +590,7 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -g \ -w \ -Wno-format \ -m32 \ @@ -695,6 +696,7 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -g \ -w \ -Wno-format \ -m32 \ diff --git a/openssl.target.linux-arm.mk b/openssl.target.linux-arm.mk index 163c72c..0451d76 100644 --- a/openssl.target.linux-arm.mk +++ b/openssl.target.linux-arm.mk @@ -588,6 +588,7 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -g \ -w \ -Wno-format \ -fno-tree-sra \ @@ -686,6 +687,7 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -g \ -w \ -Wno-format \ -fno-tree-sra \ diff --git a/openssl.target.linux-mips.mk b/openssl.target.linux-mips.mk index 1589f13..9a3ac9c 100644 --- a/openssl.target.linux-mips.mk +++ b/openssl.target.linux-mips.mk @@ -586,6 +586,7 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -g \ -w \ -Wno-format \ -EL \ @@ -681,6 +682,7 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -g \ -w \ -Wno-format \ -EL \ diff --git a/openssl.target.linux-x86.mk b/openssl.target.linux-x86.mk index 845a045..28850f7 100644 --- a/openssl.target.linux-x86.mk +++ b/openssl.target.linux-x86.mk @@ -590,6 +590,7 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -g \ -w \ -Wno-format \ -m32 \ @@ -695,6 +696,7 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -g \ -w \ -Wno-format \ -m32 \ -- cgit v1.2.3