Add nacl_sdk gyp meta-target.

build/untrusted.gypi

Index: build/untrusted.gypi
diff --git a/build/untrusted.gypi b/build/untrusted.gypi
index 51a0cf8f334c8455ba6f1599e7c24678b7942254..7ba8342d22c07584b7c59d3791748ec803d6198f 100755
--- a/build/untrusted.gypi
+++ b/build/untrusted.gypi
@@ -61,6 +61,7 @@
         'variables': {
           'nexe_target': '',
           'nlib_target': '',
+          'nso_target': '',
           'build_newlib': 0,
           'build_glibc': 0,
           'disable_glibc%': 0,
@@ -116,6 +117,7 @@
           'python_exe': 'python',
           'nexe_target': '',
           'nlib_target': '',
+          'nso_target': '',
           'build_newlib': 0,
           'build_glibc': 0,
           'disable_glibc%': 1,
@@ -560,6 +562,86 @@
                },

[binji, 2012/09/06 00:34:25]

Copied from the glibc/nlib condition above. Changes are marked below.

              ],
            }],
+           ['nso_target!="" and build_glibc!=0 and enable_x86_64!=0 and disable_glibc==0', {

[binji, 2012/09/06 00:34:25]

nlib_target -> nso_target

+             'variables': {
+                'tool_name': 'glibc',
+                'inst_dir': '<(SHARED_INTERMEDIATE_DIR)/tc_glibc',
+                'objdir_glibc64%': '>(INTERMEDIATE_DIR)/<(tool_name)-x86-64-so/>(_target_name)',

[binji, 2012/09/06 00:34:25]

x86-64 -> x86-64-so

+                'source_list_glibc64%': '<(tool_name)-x86-64-so.>(_target_name).source_list.gypcmd',

[binji, 2012/09/06 00:34:25]

x86-64 -> x86-64-so

+                'out_glibc64%': '<(SHARED_INTERMEDIATE_DIR)/tc_<(tool_name)/lib64/>(nso_target)',
+             },
+             'actions': [
+               {
+                 'action_name': 'build glibc x86-64 nso',

[binji, 2012/09/06 00:34:25]

nlib -> nso

+                 'msvs_cygwin_shell': 0,
+                 'description': 'building >(out_glibc64)',
+                 'inputs': [
+                    '<(DEPTH)/native_client/build/build_nexe.py',
+                    '<(DEPTH)/ppapi/ppapi_cpp.gypi',
+                    '>!@pymod_do_main(>(get_sources) >(sources) >(_sources))',
+                    '>@(extra_deps_glibc64)',
+                    '>(source_list_glibc64)',
+                 ],
+                 'outputs': ['>(out_glibc64)'],
+                 'action': [
+                   '>(python_exe)',
+                   '<(DEPTH)/native_client/build/build_nexe.py',
+                   '>@(extra_args)',
+                   '--arch', 'x86-64',
+                   '--build', 'glibc_nso',

[binji, 2012/09/06 00:34:25]

nlib -> nso

+                   '--root', '<(DEPTH)',
+                   '--name', '>(out_glibc64)',
+                   '--objdir', '>(objdir_glibc64)',
+                   '--include-dirs=<(inst_dir)/include ^(include_dirs) >(_include_dirs)',
+                   '--lib-dirs=>(lib_dirs_glibc64) ',
+                   '--compile_flags=-m64 -fPIC ^(compile_flags) >(_compile_flags)',

[binji, 2012/09/06 00:34:25]

added -fPIC

+                   '--defines=^(defines) >(_defines)',
+                   '--link_flags=-B<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64 ^(link_flags) >(_link_flags)',
+                   '--source-list=^|(<(source_list_glibc64) ^(_sources) ^(sources))',
+                 ],
+               },
+             ],
+           }],
+           ['nso_target!="" and build_glibc!=0 and enable_x86_32!=0 and disable_glibc==0', {

[binji, 2012/09/06 00:34:25]

nlib -> nso

+             'variables': {
+                'tool_name': 'glibc',
+                'inst_dir': '<(SHARED_INTERMEDIATE_DIR)/tc_glibc',
+                'out_glibc32%': '<(SHARED_INTERMEDIATE_DIR)/tc_<(tool_name)/lib32/>(nso_target)',
+                'objdir_glibc32%': '>(INTERMEDIATE_DIR)/<(tool_name)-x86-32-so/>(_target_name)',

[binji, 2012/09/06 00:34:25]

x86-32 -> x86-32-so

+                'source_list_glibc32%': '<(tool_name)-x86-32-so.>(_target_name).source_list.gypcmd',

[binji, 2012/09/06 00:34:25]

x86-32 -> x86-32-so

+             },
+             'actions': [
+               {
+                 'action_name': 'build glibc x86-32 nso',

[binji, 2012/09/06 00:34:25]

nlib -> nso

+                 'msvs_cygwin_shell': 0,
+                 'description': 'building >(out_glibc32)',
+                 'inputs': [
+                    '<(DEPTH)/native_client/build/build_nexe.py',
+                    '<(DEPTH)/ppapi/ppapi_cpp.gypi',
+                    '>!@pymod_do_main(>(get_sources) >(sources) >(_sources))',
+                    '>@(extra_deps_glibc32)',
+                    '>(source_list_glibc32)',
+                 ],
+                 'outputs': ['>(out_glibc32)'],
+                 'action': [
+                   '>(python_exe)',
+                   '<(DEPTH)/native_client/build/build_nexe.py',
+                   '>@(extra_args)',
+                   '--arch', 'x86-32',
+                   '--build', 'glibc_nso',

[binji, 2012/09/06 00:34:25]

nlib -> nso

+                   '--root', '<(DEPTH)',
+                   '--name', '>(out_glibc32)',
+                   '--objdir', '>(objdir_glibc32)',
+                   '--include-dirs=<(inst_dir)/include ^(include_dirs) >(_include_dirs)',
+                   '--lib-dirs=>(lib_dirs_glibc32)',
+                   '--compile_flags=-m32 -fPIC ^(compile_flags) >(_compile_flags)',

[binji, 2012/09/06 00:34:25]

added -fPIC

+                   '--defines=^(defines) >(_defines)',
+                   '--link_flags=-m32 -B<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32 ^(link_flags) >(_link_flags)',
+                   '--source-list=^|(<(source_list_glibc32) ^(_sources) ^(sources))',
+                 ],
+               },
+             ],
+           }],

[bradn, 2012/09/06 03:00:21]

Don't you need the newlib version too?

[binji, 2012/09/06 18:36:40]

newlib doesn't support shared objects.

         ],
       },
     }],