Enable building of ppapi_nacl tests for arm/glibc

ppapi/ppapi_nacl_test_common.gypi

 # Copyright (c) 2013 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.
 
 {
   'includes': [
     '../build/common_untrusted.gypi',
   ],
   'target_defaults': {
     # We need to override the variables in untrusted.gypi outside of a
@@ skipping 27 matching lines @@
           'out_pnacl_newlib_x86_32_nonsfi_nexe': '>(nacl_pnacl_newlib_nonsfi_out_dir)/>(nexe_target)_pnacl_newlib_x32_nonsfi.nexe',
           'out_pnacl_newlib_arm_nonsfi_nexe': '>(nacl_pnacl_newlib_nonsfi_out_dir)/>(nexe_target)_pnacl_newlib_arm_nonsfi.nexe',
           'nmf_pnacl_newlib_nonsfi%': '>(nacl_pnacl_newlib_nonsfi_out_dir)/>(nexe_target).nmf',
         }],
       ],
     },
     'dependencies': [
        '<(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': [
       ['test_files!=[] and build_newlib==1', {
         'copies': [
           {
             'destination': '>(nacl_newlib_out_dir)',
             'files': [
               '>@(test_files)',
             ],
           },
         ],
       }],
-      ['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)',
             'files': [
               '>@(test_files)',
             ],
           },
         ],
       }],
       # Nonsfi pnacl copy is covered below.
@@ skipping 29 matching lines @@
             '<(DEPTH)',
           ],
           'link_flags': [
             '-lppapi_cpp',
             '-lppapi',
             '-pthread',
           ],
           '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': [
           ['generate_nmf==1 and build_newlib==1 and disable_newlib==0', {
             'actions': [
               {
                 'action_name': 'Generate NEWLIB NMF',
                 'inputs': ['>(create_nmf)'],
                 'outputs': ['>(nmf_newlib)'],
                 'action': [
@@ skipping 17 matching lines @@
                     'action': ['>(out_newlib_arm)'],
                   }],
                   ['enable_mips==1', {
                     'inputs': ['>(out_newlib_mips)'],
                     'action': ['>(out_newlib_mips)'],
                   }],
                 ],
               },
             ],
           }],
-          ['"<(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': [
               {
                 'action_name': 'Generate GLIBC NMF and copy libs',
                 'inputs': ['>(create_nmf)'],
                 # NOTE: There is no explicit dependency for the lib32
                 # and lib64 directories created in the PRODUCT_DIR.
                 # They are created as a side-effect of NMF creation.
                 'outputs': ['>(nmf_glibc)'],
                 'action': [
@@ skipping 13 matching lines @@
                       '--library-path=>(tc_lib_dir_glibc64)',
                     ],
                   }],
                   ['enable_x86_32==1', {
                     'inputs': ['>(out_glibc32)'],
                     'action': [
                       '--library-path=>(libdir_glibc32)',
                       '--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)',
+                    ],
+                  }],
                 ],
               },
             ],
           }],
           ['generate_nmf==1 and build_pnacl_newlib==1 and disable_pnacl==0', {
             'actions': [
               {
                 'action_name': 'Generate PNACL NEWLIB NMF',
                 # NOTE: create_nmf must be first, it is the script python
                 # executes below.
@@ skipping 55 matching lines @@
                   }],
                 ],
               },
             ],
           }],
         ],
       }],
     ],
   },
 }