Enable building of ppapi_nacl tests for arm/glibc

ppapi/ppapi_nacl.gyp

Index: ppapi/ppapi_nacl.gyp
diff --git a/ppapi/ppapi_nacl.gyp b/ppapi/ppapi_nacl.gyp
index b546954dff81b9451b61301a218e5379ecb85264..dd1ccba0c8c977ce53843ba049c30070ec0e752a 100644
--- a/ppapi/ppapi_nacl.gyp
+++ b/ppapi/ppapi_nacl.gyp
@@ -13,6 +13,31 @@
   ],
   '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': {
@@ -56,6 +81,7 @@
          '<(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': {
@@ -134,15 +160,24 @@
         '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
@@ -176,6 +211,13 @@
                 ],
                 '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)',