summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c>2014-05-20 23:25:47 +0000
committerbrettw@chromium.org <brettw@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c>2014-05-20 23:25:47 +0000
commit29e801fb234ad76f516552e0c39129f7fcb358ba (patch)
treeda214d49bbc891776fdbcc291e5d7692ec6429cc
parent3b4db11065e17f93065278faaa5952ab8d0e5c26 (diff)
downloadopenssl-29e801fb234ad76f516552e0c39129f7fcb358ba.tar.gz
Disable the chromium_code config in the GN build on ARM.
The ARM source files do not compile cleanly without warnings. R=rsleevi@chromium.org Review URL: https://codereview.chromium.org/291153006 git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/openssl@271781 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
-rw-r--r--BUILD.gn4
1 files changed, 4 insertions, 0 deletions
diff --git a/BUILD.gn b/BUILD.gn
index d29beed..749ba08 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -68,6 +68,10 @@ component("openssl") {
sources -= gypi_values.openssl_x86_source_excludes
defines += gypi_values.openssl_x86_defines
} else if (cpu_arch == "arm") {
+ # The ARM sources do not compile with full warnings enabled.
+ configs -= [ "//build/config/compiler:chromium_code" ]
+ configs += [ "//build/config/compiler:no_chromium_code" ]
+
sources += gypi_values.openssl_arm_sources
sources -= gypi_values.openssl_arm_source_excludes
defines += gypi_values.openssl_arm_defines