Move build/external_code.gypi into build/common.gypi.

BUG=35184
TEST=none
Review URL: http://codereview.chromium.org/593025

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38626 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 29 insertions, 44 deletions

diff --git a/build/common.gypi b/build/common.gypi
index 602561b..5ac7623 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -403,8 +403,35 @@
         ],  # conditions for coverage
       }],  # coverage!=0
       ['chromium_code==0', {
-        'includes': [
-          'external_code.gypi',
+        'conditions': [
+          [ 'OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
+            'cflags!': [
+              '-Wall',
+              '-Wextra',
+              '-Werror',
+            ],
+          }],
+          [ 'OS=="win"', {
+            'defines': [
+              '_CRT_SECURE_NO_DEPRECATE',
+              '_CRT_NONSTDC_NO_WARNINGS',
+              '_CRT_NONSTDC_NO_DEPRECATE',
+              '_SCL_SECURE_NO_DEPRECATE',
+            ],
+            'msvs_disabled_warnings': [4800],
+            'msvs_settings': {
+              'VCCLCompilerTool': {
+                'WarnAsError': 'false',
+                'Detect64BitPortabilityProblems': 'false',
+              },
+            },
+          }],
+          [ 'OS=="mac"', {
+            'xcode_settings': {
+              'GCC_TREAT_WARNINGS_AS_ERRORS': 'NO',
+              'WARNING_CFLAGS!': ['-Wall'],
+            },
+          }],
         ],
       }, {
         # In Chromium code, we define __STDC_FORMAT_MACROS in order to get the
diff --git a/build/external_code.gypi b/build/external_code.gypi
deleted file mode 100644
index 32991ef..0000000
--- a/build/external_code.gypi
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright (c) 2010 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-{
-  'conditions': [
-    [ 'OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
-      'cflags!': [
-        '-Wall',
-        '-Wextra',
-        '-Werror',
-      ],
-    }],
-    [ 'OS=="win"', {
-      'defines': [
-        '_CRT_SECURE_NO_DEPRECATE',
-        '_CRT_NONSTDC_NO_WARNINGS',
-        '_CRT_NONSTDC_NO_DEPRECATE',
-        '_SCL_SECURE_NO_DEPRECATE',
-      ],
-      'msvs_disabled_warnings': [4800],
-      'msvs_settings': {
-        'VCCLCompilerTool': {
-          'WarnAsError': 'false',
-          'Detect64BitPortabilityProblems': 'false',
-        },
-      },
-    }],
-    [ 'OS=="mac"', {
-      'xcode_settings': {
-        'GCC_TREAT_WARNINGS_AS_ERRORS': 'NO',
-        'WARNING_CFLAGS!': ['-Wall'],
-      },
-    }],
-  ],
-}
-
-# Local Variables:
-# tab-width:2
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=2 shiftwidth=2: