Move nacl.gypi to components.

components/nacl.gypi

 # Copyright (c) 2012 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.
 

[Mark Seaborn, 2013/07/31 18:50:43]

One other thing: Can you make this a .gyp file rather than a .gypi file?

.gyp files have cleaner semantics than .gypi files.  For example, if a .gypi
file defines a target and is included by multiple .gyp files, that would define
the target multiple times.

[Mark Seaborn, 2013/07/31 20:11:24]

I meant, can you create components/nacl.gyp rather than components/nacl.gypi? 
I'm not asking you to convert chrome/nacl.gypi to be chrome/nacl.gyp for this
change.

 {
   'include': [
     '../native_client/build/untrusted.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.
-          '../components/nacl/loader/nacl_ipc_adapter.cc',
-          '../components/nacl/loader/nacl_ipc_adapter.h',
-          '../components/nacl/loader/nacl_main.cc',
-          '../components/nacl/loader/nacl_main_platform_delegate.h',
-          '../components/nacl/loader/nacl_main_platform_delegate_linux.cc',
-          '../components/nacl/loader/nacl_main_platform_delegate_mac.mm',
-          '../components/nacl/loader/nacl_main_platform_delegate_win.cc',
-          '../components/nacl/loader/nacl_listener.cc',
-          '../components/nacl/loader/nacl_listener.h',
-          '../components/nacl/loader/nacl_validation_db.h',
-          '../components/nacl/loader/nacl_validation_query.cc',
-          '../components/nacl/loader/nacl_validation_query.h',
+          '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',
+          'nacl/loader/nacl_main_platform_delegate_win.cc',
+          'nacl/loader/nacl_listener.cc',
+          'nacl/loader/nacl_listener.h',
+          'nacl/loader/nacl_validation_db.h',
+          'nacl/loader/nacl_validation_query.cc',
+          'nacl/loader/nacl_validation_query.h',
         ],
         # TODO(gregoryd): consider switching NaCl to use Chrome OS defines
         'conditions': [
           ['OS=="win"', {
             'defines': [
               '__STDC_LIMIT_MACROS=1',
             ],
             'include_dirs': [
               '<(DEPTH)/third_party/wtl/include',
             ],
@@ skipping 82 matching lines @@
                 },
               },
               'direct_dependent_settings': {
                 'defines': [
                   '<@(nacl_defines)',
                 ],
               },
             },
           ],
         }],
-        ['OS=="linux"', {
-          'targets': [
-            {
-              'target_name': 'nacl_helper',
-              'type': 'executable',
-              'include_dirs': [
-                '..',
-              ],
-              'dependencies': [
-                '../components/nacl_common.gyp:nacl_common',
-                '../crypto/crypto.gyp:crypto',
-                '../sandbox/sandbox.gyp:libc_urandom_override',
-                '../sandbox/sandbox.gyp:sandbox',
-                'nacl',
-              ],
-              'sources': [
-                'nacl/nacl_helper_linux.cc',
-                '../base/posix/unix_domain_socket_linux.cc',
-                '../components/nacl/loader/nacl_sandbox_linux.cc',
-                '../content/common/child_process_sandbox_support_impl_shm_linux.cc',
-                '../content/common/sandbox_init_linux.cc',
-                '../content/common/sandbox_seccomp_bpf_linux.cc',
-                '../content/public/common/content_switches.cc',
-              ],
-              'conditions': [
-                ['toolkit_uses_gtk == 1', {
-                  'dependencies': [
-                    '../build/linux/system.gyp:gtk',
-                  ],
-                }],
-                ['use_glib == 1', {
-                  'dependencies': [
-                    '../build/linux/system.gyp:glib',
-                  ],
-                }],
-                ['os_posix == 1 and OS != "mac"', {
-                  'conditions': [
-                    ['linux_use_tcmalloc==1', {
-                      'dependencies': [
-                        '../base/allocator/allocator.gyp:allocator',
-                      ],
-                    }],
-                  ],
-                }],
-              ],
-              'cflags': ['-fPIE'],
-              'link_settings': {
-                'ldflags': ['-pie'],
-              },
-            },
-          ],
-        }],
       ],
     }, {  # else (disable_nacl==1)
       'targets': [
         {
           'target_name': 'nacl',
           'type': 'none',
           'sources': [],
         },
       ],
       'conditions': [
         ['OS=="win"', {
           'targets': [
             {
               'target_name': 'nacl_win64',
               'type': 'none',
               'sources': [],
             },
           ],
         }],
       ],
     }],
   ],
 }