Remove "nacl_defines" from the GYP build.

components/nacl.gyp

 # Copyright 2013 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.
 
 {
   'variables': {
     'chromium_code': 1,
   },
-  'includes': [
-    'nacl/nacl_defines.gypi',
-  ],
   'target_defaults': {
     'variables': {
       'nacl_target': 0,
     },
     'target_conditions': [
       # This part is shared between the targets defined below. Only files and
       # settings relevant for building the Win64 target should be added here.
       ['nacl_target==1', {
         'include_dirs': [
           '<(INTERMEDIATE_DIR)',
         ],
-        'defines': [
-          '<@(nacl_defines)',
-        ],
         'sources': [
           # .cc, .h, and .mm files under nacl that are used on all
           # platforms, including both 32-bit and 64-bit Windows.
           # Test files are also not included.
           'nacl/loader/nacl_ipc_adapter.cc',
           'nacl/loader/nacl_ipc_adapter.h',
           'nacl/loader/nacl_main.cc',
           'nacl/loader/nacl_main_platform_delegate.h',
           'nacl/loader/nacl_main_platform_delegate_linux.cc',
           'nacl/loader/nacl_main_platform_delegate_mac.mm',
@@ skipping 50 matching lines @@
             '../third_party/mojo/mojo_edk.gyp:mojo_system_impl',
           ],
           'conditions': [
             ['disable_nacl_untrusted==0', {
               'dependencies': [
                 '../ppapi/native_client/native_client.gyp:nacl_irt',
                 '../ppapi/native_client/src/untrusted/pnacl_support_extension/pnacl_support_extension.gyp:pnacl_support_extension',
               ],
             }],
           ],
-          'direct_dependent_settings': {
-            'defines': [
-              '<@(nacl_defines)',
-            ],
-          },
         },
         {
           'target_name': 'nacl_browser',
           'type': 'static_library',
           'sources': [
             'nacl/browser/nacl_broker_host_win.cc',
             'nacl/browser/nacl_broker_host_win.h',
             'nacl/browser/nacl_broker_service_win.cc',
             'nacl/browser/nacl_broker_service_win.h',
             'nacl/browser/nacl_browser.cc',
@@ skipping 15 matching lines @@
           ],
           'include_dirs': [
             '..',
           ],
           'dependencies': [
             'nacl_common',
             'nacl_switches',
             '../native_client/src/trusted/service_runtime/service_runtime.gyp:sel',
             '../content/content.gyp:content_browser',
           ],
-          'defines': [
-            '<@(nacl_defines)',
-          ],
           # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
           'msvs_disabled_warnings': [4267, ],
           'conditions': [
             ['OS=="linux"', {
               'sources': [
                 '../components/nacl/zygote/nacl_fork_delegate_linux.cc',
                 '../components/nacl/zygote/nacl_fork_delegate_linux.h',
               ],
               'dependencies': [
                 # Required by nacl_fork_delegate_linux.cc.
@@ skipping 35 matching lines @@
           'include_dirs': [
             '..',
           ],
           'dependencies': [
             'nacl_common',
             '../content/content.gyp:content_renderer',
             '../components/nacl/renderer/plugin/plugin.gyp:nacl_trusted_plugin',
             '../third_party/jsoncpp/jsoncpp.gyp:jsoncpp',
             '../third_party/WebKit/public/blink.gyp:blink',
           ],
-          'defines': [
-            '<@(nacl_defines)',
-          ],
-          'direct_dependent_settings': {
-            'defines': [
-              '<@(nacl_defines)',
-            ],
-          },
         },
         {
           'target_name': 'nacl_loader_unittests',
           'type': '<(gtest_target_type)',
           'sources': [
             'nacl/loader/nacl_ipc_adapter_unittest.cc',
             'nacl/loader/nacl_validation_query_unittest.cc',
             'nacl/loader/run_all_unittests.cc',
           ],
           'dependencies': [
@@ skipping 48 matching lines @@
               'link_settings': {
                 'ldflags': ['-pie'],
               },
             }, {
               'target_name': 'nacl_linux',
               'type': 'static_library',
               'include_dirs': [
                 '..',
               ],
               'defines': [
-                '<@(nacl_defines)',
                 # Allow .cc files to know if they're being compiled as part
                 # of nacl_helper.
                 'IN_NACL_HELPER=1',
               ],
               'sources': [
                 'nacl/loader/nonsfi/abi_conversion.cc',
                 'nacl/loader/nonsfi/abi_conversion.h',
                 'nacl/loader/nonsfi/elf_loader.cc',
                 'nacl/loader/nonsfi/elf_loader.h',
                 'nacl/loader/nonsfi/irt_basic.cc',
@@ skipping 97 matching lines @@
               ],
               'defines': [
                 '<@(nacl_win64_defines)',
                 'COMPILE_CONTENT_STATICALLY',
               ],
               'configurations': {
                 'Common_Base': {
                   'msvs_target_platform': 'x64',
                 },
               },
-              'direct_dependent_settings': {
-                'defines': [
-                  '<@(nacl_defines)',
-                ],
-              },
             },
             {
               'target_name': 'nacl_switches_win64',
               'type': 'static_library',
               'sources': [
                 'nacl/common/nacl_switches.cc',
                 'nacl/common/nacl_switches.h',
               ],
               'include_dirs': [
                 '..',
@@ skipping 118 matching lines @@
       ],
       'include_dirs': [
         '..',
       ],
       'dependencies': [
         '../content/content.gyp:content_common',
       ],
     },
   ]
 }