diff options
| author | binji@chromium.org <binji@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-18 20:32:26 +0000 |
|---|---|---|
| committer | binji@chromium.org <binji@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-18 20:32:26 +0000 |
| commit | 7c1c307c7a4b599c114127ec971dc356639d415c (patch) | |
| tree | 1f5287d31ae268d5457b5c822890ac04b7ee96eb /native_client_sdk/src/build_tools | |
| parent | e3736ccc35d566a899cffd5b6480f768742e61fc (diff) | |
| download | chromium_src-7c1c307c7a4b599c114127ec971dc356639d415c.zip chromium_src-7c1c307c7a4b599c114127ec971dc356639d415c.tar.gz chromium_src-7c1c307c7a4b599c114127ec971dc356639d415c.tar.bz2 | |
[NaCl SDK] Add multi-platform zip support, and example.
BUG=none
R=sbc@chromium.org
Review URL: https://codereview.chromium.org/241803002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@264844 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'native_client_sdk/src/build_tools')
| -rw-r--r-- | native_client_sdk/src/build_tools/generate_make.py | 2 | ||||
| -rwxr-xr-x | native_client_sdk/src/build_tools/parse_dsc.py | 3 | ||||
| -rw-r--r-- | native_client_sdk/src/build_tools/sdk_files.list | 2 |
3 files changed, 6 insertions, 1 deletions
diff --git a/native_client_sdk/src/build_tools/generate_make.py b/native_client_sdk/src/build_tools/generate_make.py index d44d2a5..4188e7a 100644 --- a/native_client_sdk/src/build_tools/generate_make.py +++ b/native_client_sdk/src/build_tools/generate_make.py @@ -159,6 +159,7 @@ def GenerateManifest(srcroot, dstroot, desc): 'key': True, 'channel': None, 'permissions': pretty_permissions, + 'multi_platform': desc.get('MULTI_PLATFORM', False), 'version': build_version.ChromeVersionNoTrunk() } RunTemplateFileIfChanged(srcpath, dstpath, replace) @@ -262,6 +263,7 @@ def ProcessProject(pepperdir, srcroot, dstroot, desc, toolchains, configs=None, 'tools': tools, 'sel_ldr': desc.get('SEL_LDR'), 'targets': desc['TARGETS'], + 'multi_platform': desc.get('MULTI_PLATFORM', False), } RunTemplateFileIfChanged(template, make_path, template_dict) diff --git a/native_client_sdk/src/build_tools/parse_dsc.py b/native_client_sdk/src/build_tools/parse_dsc.py index 1088fef..63e55d1 100755 --- a/native_client_sdk/src/build_tools/parse_dsc.py +++ b/native_client_sdk/src/build_tools/parse_dsc.py @@ -65,7 +65,8 @@ DSC_FORMAT = { 'GROUP': (str, '', False), 'EXPERIMENTAL': (bool, [True, False], False), 'PERMISSIONS': (list, '', False), - 'SOCKET_PERMISSIONS': (list, '', False) + 'SOCKET_PERMISSIONS': (list, '', False), + 'MULTI_PLATFORM': (bool, [True, False], False), } diff --git a/native_client_sdk/src/build_tools/sdk_files.list b/native_client_sdk/src/build_tools/sdk_files.list index 0427225..605cfce 100644 --- a/native_client_sdk/src/build_tools/sdk_files.list +++ b/native_client_sdk/src/build_tools/sdk_files.list @@ -40,6 +40,7 @@ examples/Makefile examples/tutorial/debugging/* examples/tutorial/dlopen/* examples/tutorial/load_progress/* +examples/tutorial/multi_platform/* [win]examples/tutorial/make.bat examples/tutorial/Makefile examples/tutorial/testing/* @@ -415,6 +416,7 @@ tools/create_nmf.py tools/decode_dump.py [linux,mac]tools/dump_syms tools/fix_deps.py +tools/fix_manifest.py tools/genhttpfs.py tools/getos.py tools/host_gcc.mk |