Enable building of ppapi_nacl tests for arm/glibc

ppapi/ppapi_nacl.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.
 
 # This GYP file defines untrusted (NaCl) targets.  All targets in this
 # file should be conditionally depended upon via 'disable_nacl!=1' to avoid
 # requiring NaCl sources for building.
 
 {
   'includes': [
     '../build/common_untrusted.gypi',
     'ppapi_sources.gypi',
   ],
   'targets': [
     {
+      'target_name': 'nacl_elf_loader',
+      'type': 'none',
+      'conditions': [
+        ['target_arch=="arm" and disable_glibc==0', {
+          'dependencies': [
+            '<(DEPTH)/native_client/src/untrusted/elf_loader/elf_loader.gyp:elf_loader_nexe',
+          ],
+          'actions': [
+          {
+            'action_name': 'copy_arm_elf_loader',
+            'message': 'Copying elf_loader_arm.nexe',
+            'inputs': [
+              '<(PRODUCT_DIR)/elf_loader_newlib_arm.nexe',
+            ],
+            'outputs': [
+              '>(tc_lib_dir_glibc_arm)/elf_loader_arm.nexe',
+            ],
+            'action': [
+              'python', '<(DEPTH)/build/cp.py', '>@(_inputs)', '>@(_outputs)'
+            ],
+          }],
+        }],
+      ],
+    },
+    {
       'target_name': 'ppapi_cpp_lib',
       'type': 'none',
       'variables': {
         'nlib_target': 'libppapi_cpp.a',
         'nso_target': 'libppapi_cpp.so',
         'nacl_untrusted_build': 1,
         'build_glibc': 1,
         'build_newlib': 1,
         'build_pnacl_newlib': 1,
         'sources': [
@@ skipping 23 matching lines @@
         ],
       },
     },
     {
       'target_name': 'ppapi_nacl_tests',
       'type': 'none',
       'dependencies': [
          '<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:nacl_lib',
          '<(DEPTH)/native_client/src/untrusted/pthread/pthread.gyp:pthread_lib',
          'ppapi_cpp_lib',
+         'nacl_elf_loader',
          'native_client/native_client.gyp:ppapi_lib',
       ],
       'variables': {
         # This is user code (vs IRT code), so tls accesses do not
         # need to be indirect through a function call.
         'newlib_tls_flags=': [],
         # TODO(bradnelson): Remove this compile flag once new nacl_rev is
         # above 9362.
         'compile_flags': [
           '-DGL_GLEXT_PROTOTYPES',
@@ skipping 58 matching lines @@
           '>(tc_lib_dir_pnacl_newlib)/libppapi_cpp.a',
           '>(tc_lib_dir_pnacl_newlib)/libppapi.a',
         ],
         'sources': [
           '<@(test_common_source_files)',
           '<@(test_nacl_source_files)',
         ],
         'extra_args': [
           '--strip-all',
         ],
+        'variables': {
+          'conditions': [
+            ['target_arch=="arm"', {
+              'objdump': '>(nacl_glibc_tc_root)/bin/arm-nacl-objdump'
+            }, {
+              'objdump': '>(nacl_glibc_tc_root)/bin/x86_64-nacl-objdump'
+            }],
+          ]
+        },
         'create_nmf': '<(DEPTH)/native_client_sdk/src/tools/create_nmf.py',
         'create_nmf_flags': [
           '--no-default-libpath',
-          '--objdump=>(nacl_glibc_tc_root)/bin/x86_64-nacl-objdump',
+          '--objdump=<(objdump)',
         ],
         'create_nonsfi_test_nmf': 'tests/create_nonsfi_test_nmf.py',
       },
       'conditions': [
-        ['(target_arch=="ia32" or target_arch=="x64") and disable_glibc==0', {
+        ['target_arch!="mipsel" and disable_glibc==0', {
           'variables': {
             'build_glibc': 1,
             # NOTE: Use /lib, not /lib64 here; it is a symbolic link which
             # doesn't work on Windows.
             'libdir_glibc64': '>(nacl_glibc_tc_root)/x86_64-nacl/lib',
             'libdir_glibc32': '>(nacl_glibc_tc_root)/x86_64-nacl/lib32',
             'nmf_glibc%': '<(PRODUCT_DIR)/>(nexe_target)_glibc.nmf',
           },
           'actions': [
           {
@@ skipping 13 matching lines @@
               '--stage-dependencies=<(PRODUCT_DIR)',
             ],
             'conditions': [
               ['target_arch=="ia32"', {
                 'action': [
                   '--library-path=>(libdir_glibc32)',
                   '--library-path=>(tc_lib_dir_glibc32)',
                 ],
                 'inputs': ['>(out_glibc32)'],
               }],
+              ['target_arch=="arm"', {
+                'action': [
+                  '--library-path=>(nacl_glibc_tc_root)/arm-nacl/lib',
+                  '--library-path=>(tc_lib_dir_glibc_arm)',
+                ],
+                'inputs': ['>(out_glibc_arm)'],
+              }],
               ['target_arch=="x64" or (target_arch=="ia32" and OS=="win")', {
                 'action': [
                   '--library-path=>(libdir_glibc64)',
                   '--library-path=>(tc_lib_dir_glibc64)',
                 ],
                 'inputs': ['>(out_glibc64)'],
               }],
             ],
           },
         ],
@@ skipping 162 matching lines @@
                 '>@(create_nmf_flags)',
                 '--output=>(nmf_pnacl)',
               ],
             },
           ],
         }],
       ],
     },
   ],
 }