Split mojo_nacl.gyp to fix ARM builds.

mojo/mojo_nacl.gyp

Index: mojo/mojo_nacl.gyp
diff --git a/mojo/mojo_nacl.gyp b/mojo/mojo_nacl.gyp
index 82eb1be7e333c745fdaaba4fa1f5a475735659e8..4007454369dc5caf2307e3aeedf27d6592bb62cc 100644
--- a/mojo/mojo_nacl.gyp
+++ b/mojo/mojo_nacl.gyp
@@ -9,8 +9,6 @@
         'monacl_codegen_dir': '<(SHARED_INTERMEDIATE_DIR)/<!(python <(DEPTH)/build/inverse_depth.py <(DEPTH))/monacl',
       },
       'includes': [
-        'mojo_variables.gypi',
-        '../build/common_untrusted.gypi',
         '../components/nacl/nacl_defines.gypi',
       ],
       'targets': [
@@ -100,53 +98,6 @@
             'nacl/monacl_shell.cc',
           ],
         },
-        {
-          'target_name': 'mojo_nacl',
-          'type': 'none',
-          'variables': {
-            'nlib_target': 'libmojo.a',
-            'build_glibc': 0,
-            'build_newlib': 0,
-            'build_pnacl_newlib': 1,
-          },
-          'defines': [
-            '<@(nacl_defines)',
-          ],
-          'sources': [
-            '<(monacl_codegen_dir)/libmojo.cc',
-          ],
-          'dependencies': [
-            'monacl_codegen',
-          ],
-        },
-        {
-          'target_name': 'monacl_test',
-          'type': 'none',
-          'variables': {
-            'nexe_target': 'monacl_test',
-            'build_newlib': 0,
-            'build_pnacl_newlib': 1,
-            'translate_pexe_with_build': 1,
-            'link_flags': [
-              '-pthread',
-              '-lmojo',
-              '-limc_syscalls',
-            ],
-            'sources': [
-              '<@(mojo_public_system_unittest_sources)',
-            ],
-          },
-          'dependencies': [
-            '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
-            '<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:nacl_lib',
-            '<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:imc_syscalls_lib',
-            '<(DEPTH)/native_client/src/untrusted/pthread/pthread.gyp:pthread_lib',
-            '../testing/gtest_nacl.gyp:gtest_nacl',
-            '../testing/gtest_nacl.gyp:gtest_main_nacl',
-            'mojo_nacl',
-            'monacl_codegen',
-          ],
-        },
       ],
     }],
   ],