Enable transitional non-SFI browser tests on ARM

components/nacl_nonsfi.gyp

 # Copyright 2014 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': [
     '../build/common_untrusted.gypi',
@@ skipping 21 matching lines @@
           # TODO(crbug.com/358465): Implement it then switch nacl_helper in
           # Non-SFI mode to nacl_helper_nonsfi.
           'target_name': 'nacl_helper_nonsfi',
           'type': 'none',
           'variables': {
             'nacl_untrusted_build': 1,
             'nexe_target': 'nacl_helper_nonsfi',
             # Rename the output binary file to nacl_helper_nonsfi and put it
             # directly under out/{Debug,Release}/.
             'out_newlib32_nonsfi': '<(PRODUCT_DIR)/nacl_helper_nonsfi',
+            'out_newlib_arm_nonsfi': '<(PRODUCT_DIR)/nacl_helper_nonsfi',
 
             'build_glibc': 0,
             'build_newlib': 0,
             'build_irt': 0,
             'build_pnacl_newlib': 0,
             'build_nonsfi_helper': 1,
 
             'sources': [
               'nacl/common/nacl_messages.cc',
               'nacl/common/nacl_types.cc',
@@ skipping 45 matching lines @@
                   '>(tc_lib_dir_nonsfi_helper32)/libipc_nacl_nonsfi.a',
                   '>(tc_lib_dir_nonsfi_helper32)/liblatency_info_nacl.a',
                   '>(tc_lib_dir_nonsfi_helper32)/libplatform.a',
                   '>(tc_lib_dir_nonsfi_helper32)/libppapi_ipc_nacl.a',
                   '>(tc_lib_dir_nonsfi_helper32)/libppapi_proxy_nacl.a',
                   '>(tc_lib_dir_nonsfi_helper32)/libppapi_shared_nacl.a',
                   '>(tc_lib_dir_nonsfi_helper32)/libshared_memory_support_nacl.a',
                   '>(tc_lib_dir_nonsfi_helper32)/libtracing_nacl.a',
                 ],
               }],
+              ['target_arch=="arm"', {
+                'extra_deps_newlib_arm_nonsfi': [
+                  '>(tc_lib_dir_nonsfi_helper_arm)/libbase_nacl_nonsfi.a',
+                  '>(tc_lib_dir_nonsfi_helper_arm)/libcommand_buffer_client_nacl.a',
+                  '>(tc_lib_dir_nonsfi_helper_arm)/libcommand_buffer_common_nacl.a',
+                  '>(tc_lib_dir_nonsfi_helper_arm)/libcontent_common_nacl_nonsfi.a',
+                  '>(tc_lib_dir_nonsfi_helper_arm)/libelf_loader.a',
+                  '>(tc_lib_dir_nonsfi_helper_arm)/libevent_nacl_nonsfi.a',
+                  '>(tc_lib_dir_nonsfi_helper_arm)/libgio.a',
+                  '>(tc_lib_dir_nonsfi_helper_arm)/libgles2_cmd_helper_nacl.a',
+                  '>(tc_lib_dir_nonsfi_helper_arm)/libgles2_implementation_nacl.a',
+                  '>(tc_lib_dir_nonsfi_helper_arm)/libgles2_utils_nacl.a',
+                  '>(tc_lib_dir_nonsfi_helper_arm)/libgpu_ipc_nacl.a',
+                  '>(tc_lib_dir_nonsfi_helper_arm)/libipc_nacl_nonsfi.a',
+                  '>(tc_lib_dir_nonsfi_helper_arm)/liblatency_info_nacl.a',
+                  '>(tc_lib_dir_nonsfi_helper_arm)/libplatform.a',
+                  '>(tc_lib_dir_nonsfi_helper_arm)/libppapi_ipc_nacl.a',
+                  '>(tc_lib_dir_nonsfi_helper_arm)/libppapi_proxy_nacl.a',
+                  '>(tc_lib_dir_nonsfi_helper_arm)/libppapi_shared_nacl.a',
+                  '>(tc_lib_dir_nonsfi_helper_arm)/libshared_memory_support_nacl.a',
+                  '>(tc_lib_dir_nonsfi_helper_arm)/libtracing_nacl.a',
+                ],
+              }],
             ],
           },
           'dependencies': [
             '../base/base_nacl.gyp:base_nacl_nonsfi',
             '../content/content_nacl_nonsfi.gyp:content_common_nacl_nonsfi',
             '../ipc/ipc_nacl.gyp:ipc_nacl_nonsfi',
             '../native_client/src/nonsfi/irt/irt.gyp:nacl_sys_private',
             '../native_client/src/nonsfi/loader/loader.gyp:elf_loader',
             '../native_client/src/untrusted/nacl/nacl.gyp:nacl_lib_newlib',
             '../native_client/tools.gyp:prep_toolchain',
             '../ppapi/ppapi_proxy_nacl.gyp:ppapi_proxy_nacl',
           ],
         },
         # TODO(hidehiko): Add Non-SFI version of nacl_loader_unittests.
       ],
     }],
   ],
 }