Create a build_config header file.

build/common.gypi

Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index 4c6289fa4ebc6331ec19a2675f2ec74cb9ff0e8d..fab532912cb24a21b519bff3d42550d016e6cf09 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -297,6 +297,7 @@
           '-pthread',
           '-fno-exceptions',
           '-Wall', # TODO(bradnelson): why does this disappear?!?
+          '-include', 'native_client/src/include/build_config.h'
         ],
         'conditions': [
           ['nacl_standalone==1 and OS=="linux"', {
@@ -305,13 +306,13 @@
           ['OS=="android"', {
             'target_conditions': [
               ['_toolset=="target"', {
-                'defines': ['NACL_ANDROID=1'],
+                'defines': ['ANDROID'],
               }, {
-                'defines': ['NACL_ANDROID=0'],
+                'defines!': ['ANDROID'],

[Mark Seaborn, 2015/01/07 20:52:38]

This "defines!" entry is not needed, I think.

[teravest, 2015/01/08 17:17:13]

Removed.

               }],
             ],
            }, {
-            'defines': ['NACL_ANDROID=0'],
+            'defines!': ['ANDROID'],

[Mark Seaborn, 2015/01/07 20:52:38]

Ditto

[teravest, 2015/01/08 17:17:13]

Removed.

             'link_settings': {
               'libraries': [
                 '-lrt',
@@ -449,9 +450,6 @@
           '-Wl,-z,noexecstack',
         ],
         'defines': [
-          'NACL_LINUX=1',
-          'NACL_OSX=0',
-          'NACL_WINDOWS=0',
           '_DEFAULT_SOURCE=1',
           '_BSD_SOURCE=1',
           '_POSIX_C_SOURCE=199506',
@@ -533,6 +531,9 @@
           'USE_HEADERMAP': 'NO',
           # TODO(bradnelson): -Werror ?!?
           'WARNING_CFLAGS': ['-Wall', '-Wendif-labels', '-Wno-long-long'],
+          'OTHER_CFLAGS': [
+            '-include', 'native_client/src/include/build_config.h'
+          ],
           'conditions': [
             ['chromium_mac_pch', {'GCC_PRECOMPILE_PREFIX_HEADER': 'YES'},
                                  {'GCC_PRECOMPILE_PREFIX_HEADER': 'NO'}],
@@ -643,12 +644,6 @@
             ],
           }],
         ],
-        'defines': [
-          'NACL_LINUX=0',
-          'NACL_ANDROID=0',
-          'NACL_OSX=1',
-          'NACL_WINDOWS=0',
-        ],
       },
     }],
     ['OS=="win"', {
@@ -703,11 +698,6 @@
           '_SECURE_ATL',
           '__STDC_LIMIT_MACROS=1',
           '_HAS_EXCEPTIONS=0',
-
-          'NACL_LINUX=0',
-          'NACL_ANDROID=0',
-          'NACL_OSX=0',
-          'NACL_WINDOWS=1'
         ],
         'conditions': [
           ['MSVS_VERSION=="2008"', {
@@ -730,6 +720,9 @@
             'WarnAsError': 'true',
             'DebugInformationFormat': '3',
             'ExceptionHandling': '0',
+            'AdditionalOptions': [
+              '/FI', 'native_client/src/include/build_config.h'
+            ],
           },
           'VCLibrarianTool': {
             'AdditionalOptions': ['/ignore:4221'],