summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbinji@chromium.org <binji@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-19 01:22:31 +0000
committerbinji@chromium.org <binji@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-19 01:22:31 +0000
commitd0215d215ffdc9abd2678110758aac6c643f69fe (patch)
tree80250713b8ab003e97ab3c628eb28cee8168b509
parent492202578a09fe1890995d7c8910a2f03e00a19b (diff)
downloadchromium_src-d0215d215ffdc9abd2678110758aac6c643f69fe.zip
chromium_src-d0215d215ffdc9abd2678110758aac6c643f69fe.tar.gz
chromium_src-d0215d215ffdc9abd2678110758aac6c643f69fe.tar.bz2
[NaCl SDK] Generate all versions for pepper interfaces in naclsdk/src/ppapi/*
BUG=none TEST=none Review URL: https://chromiumcodereview.appspot.com/10532213 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@142887 0039d316-1c4b-4281-b951-d872f2087c98
-rwxr-xr-xnative_client_sdk/src/build_tools/build_sdk.py10
1 files changed, 6 insertions, 4 deletions
diff --git a/native_client_sdk/src/build_tools/build_sdk.py b/native_client_sdk/src/build_tools/build_sdk.py
index 26b70fa1..ba44579 100755
--- a/native_client_sdk/src/build_tools/build_sdk.py
+++ b/native_client_sdk/src/build_tools/build_sdk.py
@@ -188,9 +188,11 @@ def InstallHeaders(tc_dst_inc, pepper_ver, tc_name):
os.path.join(ppapi, 'c', 'dev'))
# Run the generator to overwrite IDL files
- buildbot_common.Run([sys.executable, 'generator.py', '--wnone', '--cgen',
- '--release=M' + pepper_ver, '--verbose', '--dstroot=%s/c' % ppapi],
- cwd=os.path.join(PPAPI_DIR, 'generators'))
+ generator_args = [sys.executable, 'generator.py', '--wnone', '--cgen',
+ '--verbose', '--dstroot=%s/c' % ppapi]
+ if pepper_ver:
+ generator_args.append('--release=M' + pepper_ver)
+ buildbot_common.Run(generator_args, cwd=os.path.join(PPAPI_DIR, 'generators'))
# Remove private and trusted interfaces
buildbot_common.RemoveDir(os.path.join(ppapi, 'c', 'private'))
@@ -467,7 +469,7 @@ def main(args):
if not skip_build:
BuildToolchains(pepperdir, platform, arch, pepper_ver, toolchains)
- InstallHeaders(os.path.join(pepperdir, 'src'), pepper_ver, 'libs')
+ InstallHeaders(os.path.join(pepperdir, 'src'), None, 'libs')
if not skip_build:
buildbot_common.BuildStep('Copy make OS helpers')