Enable PPAPINaCl GLIBC browser_tests.

ppapi/ppapi_untrusted.gyp

Index: ppapi/ppapi_untrusted.gyp
diff --git a/ppapi/ppapi_untrusted.gyp b/ppapi/ppapi_untrusted.gyp
index ebe4e5f6fd68acd8dcfc7feafea92f4cdfbd1562..909a3be2c68ba6ce24ec415502d43b208ba1548f 100644
--- a/ppapi/ppapi_untrusted.gyp
+++ b/ppapi/ppapi_untrusted.gyp
@@ -17,7 +17,7 @@
       'type': 'none',
       'variables': {
         'nlib_target': 'libppapi_cpp.a',
-        'build_glibc': 0,
+        'build_glibc': 1,
         'build_newlib': 1,
         'sources': [
           '<@(cpp_source_files)',
@@ -39,8 +39,11 @@
        ],
       'variables': {
         'nexe_target': 'ppapi_nacl_tests',
-        'build_glibc': 0,
+        'build_glibc': 1,
         'build_newlib': 1,
+        'nmf%': '<(PRODUCT_DIR)/>(nexe_target)_glibc.nmf',

[dmichael (off chromium), 2012/05/22 00:04:43]

maybe this should be named nmf_glibc% or something, since it's only used for the
glibc tests

[Brad Chen, 2012/05/22 18:35:00]

Done.

+        'tc_lib64%': '>(nacl_glibc_tc_root)/x86_64-nacl/lib64',
+        'tc_lib32%': '>(nacl_glibc_tc_root)/x86_64-nacl/lib32',
         'include_dirs': [
           'lib/gl/include',
           '..',
@@ -49,14 +52,22 @@
           '-lppapi_cpp',
           '-lppapi',
         ],
-        'extra_deps64': [
+        'extra_deps_newlib64': [
           '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libppapi_cpp.a',
           '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libppapi.a',
         ],
-        'extra_deps32': [
+        'extra_deps_newlib32': [
           '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libppapi_cpp.a',
           '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libppapi.a',
         ],
+        'extra_deps_glibc64': [
+          '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64/libppapi_cpp.a',
+          '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64/libppapi.a',
+        ],
+        'extra_deps_glibc32': [
+          '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32/libppapi_cpp.a',
+          '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32/libppapi.a',
+        ],
         'extra_deps_arm': [
           '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm/libppapi_cpp.a',
           '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm/libppapi.a',
@@ -66,6 +77,25 @@
           '<@(test_nacl_source_files)',
         ],
       },
+      'actions': [
+          {
+              'action_name': 'Generate NMF file and copy libs',

[dmichael (off chromium), 2012/05/22 00:04:43]

nit: It looks like you have 4-space indent instead of 2-space for 81->97

[Brad Chen, 2012/05/22 18:35:00]

Done.

+              'inputs': ['>(out64)', '>(out32)'],
+              # 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)'],
+              'action': [
+                  '>(python_exe)',
+                  '<(DEPTH)/native_client_sdk/src/tools/create_nmf.py',
+                  '>@(_inputs)',
+                  '--library-path=>(tc_lib64)',
+                  '--library-path=>(tc_lib32)',
+                  '--output=>(nmf)',
+                  '--stage-dependencies=<(PRODUCT_DIR)',
+              ],
+          },
+      ],
     },
   ],
 }