Rollback debug mode changes

brightray/brightray.gypi

@@ -92,6 +92,8 @@
       'Common_Base': {
         'abstract': 1,
         'defines': [
+          # We are using Release version libchromiumcontent:
+          'NDEBUG',
           # Needed by gin:
           'V8_USE_EXTERNAL_STARTUP_DATA',
           # From skia_for_chromium_defines.gypi:
@@ -187,7 +189,6 @@
           # Use this instead of "NDEBUG" to determine whether we are in
           # Debug build, because "NDEBUG" is already used by Chromium.
           'DEBUG',
-          '_DEBUG',
           # Require when using libchromiumcontent.
           'COMPONENT_BUILD',
           'GURL_DLL',
@@ -197,32 +198,15 @@
         ],
         'msvs_settings': {
           'VCCLCompilerTool': {
-            'RuntimeLibrary': '3',  # /MDd (debug DLL)
+            'RuntimeLibrary': '2',  # /MD (nondebug DLL)
             'Optimization': '0',  # 0 = /Od
             # See http://msdn.microsoft.com/en-us/library/8wtf2dfz(VS.71).aspx
             'BasicRuntimeChecks': '3',  # 3 = all checks enabled, 0 = off
           },
-          'VCLinkerTool': {
-            'OptimizeReferences': 2, # /OPT:REF
-            'EnableCOMDATFolding': 2, # /OPT:ICF
-          },
         },
-        'conditions': [
-          ['OS=="linux" and target_arch=="x64"', {
-            'defines': [
-              '_GLIBCXX_DEBUG',
-            ],
-            'cflags': [
-              '-g',
-            ],
-          }],  # OS=="linux"
-        ],
       },  # Debug_Base
       'Release_Base': {
         'abstract': 1,
-        'defines': [
-          'NDEBUG',
-        ],
         'msvs_settings': {
           'VCCLCompilerTool': {
             'RuntimeLibrary': '2',  # /MD (nondebug DLL)