Non-SFI mode: Build ppapi libraries for nacl_helper_nonsfi.

ppapi/ppapi_proxy_nacl.gyp

Index: ppapi/ppapi_proxy_nacl.gyp
diff --git a/ppapi/ppapi_proxy_nacl.gyp b/ppapi/ppapi_proxy_nacl.gyp
index 868465d4ae1349141077542f3f13744851f54df1..53e38e634f3158e99b78c0085ae870117fea655d 100644
--- a/ppapi/ppapi_proxy_nacl.gyp
+++ b/ppapi/ppapi_proxy_nacl.gyp
@@ -45,6 +45,47 @@
             '../ui/events/latency_info_nacl.gyp:latency_info_nacl',
           ],
         },
+        {
+          'target_name': 'ppapi_proxy_nacl_nonsfi',
+          'type': 'none',
+          'variables': {
+            'ppapi_proxy_target': 1,
+            'nacl_untrusted_build': 1,
+            'nlib_target': 'libppapi_proxy_nacl_nonsfi.a',
+            'build_glibc': 0,
+            'build_newlib': 0,
+            'build_irt': 0,
+            'build_pnacl_newlib': 0,
+            'build_nonsfi_helper': 1,
+          },
+          'include_dirs': [
+            '..',
+          ],
+          # For nacl_helper_nonsfi, we do not need start-up procedures for
+          # NaCl in SFI mode.
+          'sources!': [
+            'nacl_irt/irt_ppapi.cc',

[Mark Seaborn, 2014/10/27 18:59:07]

Surely you are going to want some of irt_ppapi.cc eventually, such as the
definition of irt_ppapihook?

In the interests of reducing the number of targets duplicated as "FOO" and
"FOO_nonsfi" variants, can you do conditionalisation in these source files
instead of in the Gyp logic, please?

(For now, I think that irt_ppapi.cc will compile fine as-is.  So maybe we can
leave adding #ifs to it until the point where we can test them?)

[hidehiko, 2014/10/28 20:14:00]

Ah, I didn't think about sharing the irt_ppapi.cc, but admittedly we can.
Now, irt_ppapi is properly built for nacl_helper_nonsfi (rather than exclude its
contents by #ifdef).

+            'nacl_irt/irt_ppapi.h',
+            'nacl_irt/irt_start.cc',

[Mark Seaborn, 2014/10/27 18:59:07]

Same applies to irt_start.cc.  At the point where you need this to be
conditionalised, you could wrap the code in this file with "#if OS_NACL_SFI".

[hidehiko, 2014/10/28 20:14:00]

Unlike irt_ppapi.cc, we won't use this at all. Exclude its contents by #ifdef at
all. 

+          ],
+          'dependencies': [
+            '../base/base_nacl.gyp:base_nacl_nonsfi',
+            '../components/tracing_nacl.gyp:tracing_nacl',
+            '../gpu/command_buffer/command_buffer_nacl.gyp:gles2_utils_nacl',
+            '../gpu/gpu_nacl.gyp:command_buffer_client_nacl',
+            '../gpu/gpu_nacl.gyp:command_buffer_common_nacl',
+            '../gpu/gpu_nacl.gyp:gles2_cmd_helper_nacl',
+            '../gpu/gpu_nacl.gyp:gles2_implementation_nacl',
+            '../gpu/gpu_nacl.gyp:gpu_ipc_nacl',
+            '../ipc/ipc_nacl.gyp:ipc_nacl_nonsfi',
+            '../native_client/tools.gyp:prep_toolchain',
+            '../ppapi/ppapi_ipc_nacl.gyp:ppapi_ipc_nacl',
+            '../ppapi/ppapi_shared_nacl.gyp:ppapi_shared_nacl',
+            '../third_party/WebKit/public/blink_headers.gyp:blink_headers',
+            '../third_party/khronos/khronos.gyp:khronos_headers',
+            '../ui/events/latency_info_nacl.gyp:latency_info_nacl',
+          ],
+        },
       ],
     }],
   ],