Enable building of ppapi_nacl tests for arm/glibc

CQ_EXTRA_TRYBOTS=tryserver.chromium.linux:linux_arm_compile
BUG=505885

Review URL: https://codereview.chromium.org/1462693004

Cr-Commit-Position: refs/heads/master@{#361029}

2 files changed, 65 insertions, 6 deletions

diff --git a/ppapi/ppapi_nacl.gyp b/ppapi/ppapi_nacl.gyp
index b546954..dd1ccba 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)',
diff --git a/ppapi/ppapi_nacl_test_common.gypi b/ppapi/ppapi_nacl_test_common.gypi
index fd1cf27..9d06aff 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)',
+                    ],
+                  }],
                 ],
               },
             ],