Add untrusted NaCl build for PPAPI proxy.

ppapi/native_client/native_client.gyp

Index: ppapi/native_client/native_client.gyp
===================================================================
--- ppapi/native_client/native_client.gyp	(revision 141859)
+++ ppapi/native_client/native_client.gyp	(working copy)
@@ -53,6 +53,10 @@
             },
           ],
         },
+      ],
+    }],
+    ['disable_nacl==0 and disable_nacl_untrusted==0 and build_ppapi_ipc_proxy_untrusted==0', {
+      'targets': [
         {
           'target_name': 'nacl_irt',
           'type': 'none',
@@ -179,5 +183,160 @@
         },
       ],
     }],
+    ['disable_nacl==0 and disable_nacl_untrusted==0 and build_ppapi_ipc_proxy_untrusted==1', {

[bradnelson, 2012/06/13 20:21:17]

Rather than make this a completely different target, is there some reason the
dependencies can't be made conditional instead, inside the target?

[Mark Seaborn, 2012/06/13 20:27:37]

We had discussed before building a separate IRT for the new proxy, so that the
two can be present side-by-side in Chromium.  Is there a specific reason you're
not doing that now?

[bbudge, 2012/06/14 03:01:18]

I'm assuming we will remove the SRPC based IRT at some point, so wanted to avoid
the extra complexity of factoring out the common parts.
On 2012/06/13 20:21:17, bradnelson wrote:

[bbudge, 2012/06/14 03:01:18]

Just to keep it simple for now.
On 2012/06/13 20:27:37, Mark Seaborn wrote:

[bbudge, 2012/06/14 03:01:18]

For now it's simpler to do it this way, and I'd like to avoid more complexity. I
agree we may want to have them side by side in the future.
On 2012/06/13 20:27:37, Mark Seaborn wrote:

[dmichael (off chromium), 2012/06/14 03:12:41]

Yeah, we probably should do it this way. It might be a bit of a pain to get it
working right, but it will make it easy to switch proxies without rebuilding, so
we can eventually do both on the bots. It will also make it easier to compare
things like IRT size.

But this seems fine for now to get something going.

[bbudge, 2012/06/15 01:07:32]

I made an attempt to use a target_defaults section, but it fails on Mac. I added
a TODO to fix this.
On 2012/06/13 20:21:17, bradnelson wrote:

+      'targets': [
+        {
+          'target_name': 'nacl_irt',
+          'type': 'none',
+          'variables': {
+            'nexe_target': 'nacl_irt',
+            # These out_* fields override the default filenames, which
+            # include a "_newlib" suffix.
+            'out_newlib64': '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe',
+            'out_newlib32': '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe',
+            'out_newlib_arm': '<(PRODUCT_DIR)/nacl_irt_arm.nexe',
+            'build_glibc': 0,
+            'build_newlib': 1,
+            'include_dirs': [
+              'lib/gl/include',
+              '..',
+            ],
+            'link_flags': [
+              '-Wl,--start-group',
+              '-lppapi_proxy_untrusted',
+              '-lppapi_shared_untrusted',
+              '-lipc_untrusted',
+              '-lbase_untrusted',
+              '-lsrpc',

[Mark Seaborn, 2012/06/13 20:27:37]

You shouldn't be depending on srpc.  Can you remove this, or add a TODO to
remove this?  The same goes for 'platform' and 'gio'.

[bbudge, 2012/06/14 03:01:18]

If I remove it I get link errors. Something is pulling it in. I will add a TODO
though.
On 2012/06/13 20:27:37, Mark Seaborn wrote:

+              '-lirt_browser',
+              '-limc_syscalls',
+              '-lplatform',
+              '-lgio',
+              '-Wl,--end-group',
+              '-lm',
+            ],
+            # See http://code.google.com/p/nativeclient/issues/detail?id=2691.
+            # The PNaCl linker (gold) does not implement the "-Ttext-segment"
+            # option.  However, with the linker for x86, the "-Ttext" option
+            # does not affect the executable's base address.
+            # TODO(olonho): simplify flags handling and avoid duplication
+            # with NaCl logic.
+            'conditions': [
+              ['target_arch!="arm"',
+               {
+                 'link_flags': [
+                   '-Wl,--section-start,.rodata=<(NACL_IRT_DATA_START)',
+                   '-Wl,-Ttext-segment=<(NACL_IRT_TEXT_START)',
+                 ]
+               }, { # target_arch == "arm"
+                 'link_flags': [
+                   '-Wl,--section-start,.rodata=<(NACL_IRT_DATA_START)',
+                   '-Wl,-Ttext=<(NACL_IRT_TEXT_START)',
+                   '--pnacl-allow-native',
+                   '-arch', 'arm',
+                   '-Wt,-mtls-use-call',
+                 ],
+               },
+             ],
+            ],
+            'sources': [
+            ],
+            'extra_args': [
+              '--strip-debug',
+            ],
+            # TODO(bradchen): get rid of extra_deps64 and extra_deps32
+            # once native_client/build/untrusted.gypi no longer needs them.
+            'extra_deps64': [
+              '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libbase_untrusted.a',
+              '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libipc_untrusted.a',
+              '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libppapi_shared_untrusted.a',
+              '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libppapi_proxy_untrusted.a',
+              '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libirt_browser.a',
+              '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libsrpc.a',
+              '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libplatform.a',
+              '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libimc_syscalls.a',
+              '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libgio.a',
+            ],
+            'extra_deps32': [
+              '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libbase_untrusted.a',
+              '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libipc_untrusted.a',
+              '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libppapi_shared_untrusted.a',
+              '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libppapi_proxy_untrusted.a',
+              '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libirt_browser.a',
+              '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libsrpc.a',
+              '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libplatform.a',
+              '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libimc_syscalls.a',
+              '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libgio.a',
+            ],
+            'extra_deps_newlib64': [
+              '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libbase_untrusted.a',
+              '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libipc_untrusted.a',
+              '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libppapi_shared_untrusted.a',
+              '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libppapi_proxy_untrusted.a',
+              '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libirt_browser.a',
+              '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libsrpc.a',
+              '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libplatform.a',
+              '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libimc_syscalls.a',
+              '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libgio.a',
+            ],
+            'extra_deps_newlib32': [
+              '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libbase_untrusted.a',
+              '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libipc_untrusted.a',
+              '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libppapi_shared_untrusted.a',
+              '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libppapi_proxy_untrusted.a',
+              '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libirt_browser.a',
+              '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libsrpc.a',
+              '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libplatform.a',
+              '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libimc_syscalls.a',
+              '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libgio.a',
+            ],
+            'extra_deps_glibc64': [
+              '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64/libbase_untrusted.a',
+              '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64/libipc_untrusted.a',
+              '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64/libppapi_shared_untrusted.a',
+              '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64/libppapi_proxy_untrusted.a',
+              '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64/libirt_browser.a',
+              '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64/libsrpc.a',
+              '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64/libplatform.a',
+              '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64/libimc_syscalls.a',
+              '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64/libgio.a',
+            ],

[dmichael (off chromium), 2012/06/14 03:12:41]

I know you're just copy/pasting, but any clue why we would have anything related
to glibc in a nacl_irt target? It doesn't seem to make sense, but I don't really
know what these are used for.

+            'extra_deps_glibc32': [
+              '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32/libbase_untrusted.a',
+              '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32/libipc_untrusted.a',
+              '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32/libppapi_shared_untrusted.a',
+              '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32/libppapi_proxy_untrusted.a',
+              '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32/libirt_browser.a',
+              '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32/libsrpc.a',
+              '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32/libplatform.a',
+              '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32/libimc_syscalls.a',
+              '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32/libgio.a',
+            ],
+            'extra_deps_arm': [
+              '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm/libbase_untrusted.a',
+              '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm/libipc_untrusted.a',
+              '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm/libppapi_shared_untrusted.a',
+              '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm/libppapi_proxy_untrusted.a',
+              '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm/libirt_browser.a',
+              '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm/libsrpc.a',
+              '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm/libplatform.a',
+              '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm/libimc_syscalls.a',
+              '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm/libgio.a',
+            ],
+          },
+          'dependencies': [
+            '../../base/base_untrusted.gyp:base_untrusted',
+            '../../ipc/ipc_untrusted.gyp:ipc_untrusted',
+            '../ppapi_proxy_untrusted.gyp:ppapi_proxy_untrusted',
+            '../ppapi_shared_untrusted.gyp:ppapi_shared_untrusted',
+            '../../native_client/src/untrusted/irt/irt.gyp:irt_browser_lib',
+            '../../native_client/src/shared/srpc/srpc.gyp:srpc_lib',
+            '../../native_client/src/shared/platform/platform.gyp:platform_lib',
+            '../../native_client/src/untrusted/nacl/nacl.gyp:imc_syscalls_lib',
+            '../../native_client/src/shared/gio/gio.gyp:gio_lib',
+          ],

[dmichael (off chromium), 2012/06/14 03:12:41]

There's a lot of copy/paste here...  if there's still that much after you deal
with comments, it might make sense to do a fake target for the common stuff,
like:
http://code.google.com/searchframe#OAMlx_jo-ck/src/ppapi/ppapi_tests.gypi&exa...

+        },
+      ],
+    }],
   ],
 }