Enable building of ppapi_nacl tests for arm/glibc

ppapi/ppapi_nacl_test_common.gypi

Index: ppapi/ppapi_nacl_test_common.gypi
diff --git a/ppapi/ppapi_nacl_test_common.gypi b/ppapi/ppapi_nacl_test_common.gypi
index fd1cf274b5f42b317b95e723dcd46527e4786631..9d06affbe7550a952036d4fa866825a76b3b7fbd 100644
--- a/ppapi/ppapi_nacl_test_common.gypi
+++ b/ppapi/ppapi_nacl_test_common.gypi
@@ -45,6 +45,7 @@
        '<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:nacl_lib',
        '<(DEPTH)/native_client/src/untrusted/pthread/pthread.gyp:pthread_lib',
        '<(DEPTH)/ppapi/ppapi_nacl.gyp:ppapi_cpp_lib',
+       '<(DEPTH)/ppapi/ppapi_nacl.gyp:nacl_elf_loader',
        '<(DEPTH)/ppapi/native_client/native_client.gyp:ppapi_lib',
     ],
     'target_conditions': [
@@ -58,7 +59,7 @@
           },
         ],
       }],
-      ['test_files!=[] and "<(target_arch)"!="arm" and "<(target_arch)"!="mipsel" and disable_glibc==0 and build_glibc==1', {
+      ['test_files!=[] and "<(target_arch)"!="mipsel" and disable_glibc==0 and build_glibc==1', {
         'copies': [
           {
             'destination': '>(nacl_glibc_out_dir)',
@@ -108,12 +109,21 @@
           '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_args_portable%': [],
           'create_nonsfi_test_nmf': '<(DEPTH)/ppapi/tests/create_nonsfi_test_nmf.py',
           'create_nmf_args': [
             '--no-default-libpath',
-            '--objdump=>(nacl_glibc_tc_root)/bin/x86_64-nacl-objdump',
+            '--objdump=<(objdump)',
           ],
         },
         'target_conditions': [
@@ -151,12 +161,13 @@
               },
             ],
           }],
-          ['"<(target_arch)"!="arm" and "<(target_arch)"!="mipsel" and generate_nmf==1 and disable_glibc==0 and build_glibc==1', {
+          ['"<(target_arch)"!="mipsel" and generate_nmf==1 and disable_glibc==0 and build_glibc==1', {
             'variables': {
               # 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',
+              'libdir_glibc_arm': '>(nacl_glibc_tc_root)/arm-nacl/lib',
             },
             'actions': [
               {
@@ -190,7 +201,13 @@
                       '--library-path=>(tc_lib_dir_glibc32)',
                     ],
                   }],
-                  # TODO(ncbray) handle arm case.  We don't have ARM glibc yet.
+                  ['enable_arm==1', {
+                    'inputs': ['>(out_glibc_arm)'],
+                    'action': [
+                      '--library-path=>(libdir_glibc_arm)',
+                      '--library-path=>(tc_lib_dir_glibc_arm)',
+                    ],
+                  }],
                 ],
               },
             ],