Move chrome/nacl to components/nacl.

components/nacl.gypi

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.

[Jói, 2013/06/27 14:18:38]

Shouldn't there be an entry for the two .gypi files in
//components/components.gyp?

 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   '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.
-          'nacl/nacl_ipc_adapter.cc',
-          'nacl/nacl_ipc_adapter.h',
-          'nacl/nacl_main.cc',
-          'nacl/nacl_main_platform_delegate.h',
-          'nacl/nacl_main_platform_delegate_linux.cc',
-          'nacl/nacl_main_platform_delegate_mac.mm',
-          'nacl/nacl_main_platform_delegate_win.cc',
-          'nacl/nacl_listener.cc',
-          'nacl/nacl_listener.h',
-          'nacl/nacl_validation_db.h',
-          'nacl/nacl_validation_query.cc',
-          'nacl/nacl_validation_query.h',
+          'nacl/common/nacl_sandbox_type_mac.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',
             ],
           },],
           ['OS=="linux"', {
             'defines': [
               '__STDC_LIMIT_MACROS=1',
             ],
             'sources': [
-              'app/nacl_fork_delegate_linux.cc',
-              'app/nacl_fork_delegate_linux.h',
+              'nacl/common/nacl_fork_delegate_linux.h',
+              'nacl/common/nacl_paths.cc',
+              'nacl/common/nacl_paths.h',
+              'nacl/loader/nacl_fork_delegate_linux.cc',
             ],
           },],
         ],
       }],
     ],
   },
   'conditions': [
     ['disable_nacl!=1', {
       'targets': [
         {
@@ skipping 37 matching lines @@
               },
               'dependencies': [
                 '../native_client/src/trusted/service_runtime/service_runtime.gyp:sel_main_chrome64',
                 '../ppapi/ppapi_internal.gyp:ppapi_shared_win64',
                 '../ppapi/ppapi_internal.gyp:ppapi_ipc_win64',
               ],
               'export_dependent_settings': [
                 '../ppapi/ppapi_internal.gyp:ppapi_ipc_win64',
               ],
               'sources': [
-                'common/nacl_cmd_line.cc',
-                'common/nacl_debug_exception_handler_win.cc',
-                'common/nacl_messages.cc',
-                'common/nacl_types.cc',
-                'nacl/nacl_broker_listener.cc',
-                'nacl/nacl_broker_listener.h',
+                'nacl/broker/nacl_broker_listener.cc',
+                'nacl/broker/nacl_broker_listener.h',
+                'nacl/common/nacl_cmd_line.cc',
+                'nacl/common/nacl_debug_exception_handler_win.cc',
+                'nacl/common/nacl_messages.cc',
+                'nacl/common/nacl_types.cc',
               ],
               'include_dirs': [
                 '..',
               ],
               'defines': [
                 '<@(nacl_win64_defines)',
                 'COMPILE_CONTENT_STATICALLY',
               ],
               'configurations': {
                 'Common_Base': {
@@ skipping 10 matching lines @@
         }],
         ['OS=="linux"', {
           'targets': [
             {
               'target_name': 'nacl_helper',
               'type': 'executable',
               'include_dirs': [
                 '..',
               ],
               'dependencies': [
+                '../components/nacl_common.gypi:nacl_common',
                 '../crypto/crypto.gyp:crypto',
                 '../sandbox/sandbox.gyp:libc_urandom_override',
                 '../sandbox/sandbox.gyp:sandbox',
                 'nacl',
               ],
               'sources': [
-                'nacl/nacl_helper_linux.cc',
-                'nacl/nacl_sandbox_linux.cc',
+                'nacl/loader/nacl_helper_linux.cc',
+                'nacl/loader/nacl_sandbox_linux.cc',
                 '../base/posix/unix_domain_socket_linux.cc',
-                '../chrome/common/nacl_messages.cc',
-                '../chrome/common/nacl_types.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',
                   ],
@@ skipping 36 matching lines @@
               'target_name': 'nacl_win64',
               'type': 'none',
               'sources': [],
             },
           ],
         }],
       ],
     }],
   ],
 }