Move nacl.gypi to components.

components/nacl.gyp

Index: components/nacl.gyp
diff --git a/chrome/nacl.gypi b/components/nacl.gyp
similarity index 64%
copy from chrome/nacl.gypi
copy to components/nacl.gyp
index 09cfbaf9cc0a67969c3925f858842546d66f016f..853a361cf5ad4597ee02ad739b9c5f11786119c0 100644
--- a/chrome/nacl.gypi
+++ b/components/nacl.gyp
@@ -3,8 +3,12 @@
 # found in the LICENSE file.
 
 {
-  'include': [
+  'variables': {
+    'chromium_code': 1,
+  },
+  'includes': [
     '../native_client/build/untrusted.gypi',
+    'nacl/nacl_defines.gypi',
   ],
   'target_defaults': {
     'variables': {
@@ -24,18 +28,18 @@
           # .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': [
@@ -138,58 +142,6 @@
             },
           ],
         }],
-        ['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': [