diff options
| author | noelallen@google.com <noelallen@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-11 18:21:20 +0000 |
|---|---|---|
| committer | noelallen@google.com <noelallen@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-11 18:21:20 +0000 |
| commit | 532d461ab08aaf3ab9f1048d7017eb659d2ece34 (patch) | |
| tree | c1f33ea22b87191b3dbba84dc0165807bcc9c36f /native_client_sdk | |
| parent | d55ed56bdd8b138afbd3e14582880d3bef70a2ad (diff) | |
| download | chromium_src-532d461ab08aaf3ab9f1048d7017eb659d2ece34.zip chromium_src-532d461ab08aaf3ab9f1048d7017eb659d2ece34.tar.gz chromium_src-532d461ab08aaf3ab9f1048d7017eb659d2ece34.tar.bz2 | |
Add "libraries" directory to SDK
Adds the PPAPI headers where they can be used by a host compiler.
Adds a define for PPAPI_RELEASE when building for the SDK.
Disables updater testing when not generating tarballs.
BUG=122229
Review URL: https://chromiumcodereview.appspot.com/10356116
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@136614 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'native_client_sdk')
| -rwxr-xr-x | native_client_sdk/src/build_tools/build_sdk.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/native_client_sdk/src/build_tools/build_sdk.py b/native_client_sdk/src/build_tools/build_sdk.py index 5c4315b..7efb156 100755 --- a/native_client_sdk/src/build_tools/build_sdk.py +++ b/native_client_sdk/src/build_tools/build_sdk.py @@ -242,6 +242,8 @@ HEADER_MAP = { 'irt.h': 'src/untrusted/irt/irt.h', 'irt_ppapi.h': 'src/untrusted/irt/irt_ppapi.h', }, + 'libs': { + }, } @@ -615,6 +617,7 @@ def main(args): buildbot_common.RemoveDir(pepperold) if not skip_untar: buildbot_common.RemoveDir(pepperdir) + buildbot_common.MakeDir(os.path.join(pepperdir, 'libraries')) buildbot_common.MakeDir(os.path.join(pepperdir, 'toolchain')) buildbot_common.MakeDir(os.path.join(pepperdir, 'tools')) else: @@ -633,6 +636,7 @@ def main(args): if not skip_build: BuildToolchains(pepperdir, platform, arch, pepper_ver, toolchains) + InstallHeaders(os.path.join(pepperdir, 'libraries'), pepper_ver, 'libs') if not skip_build: buildbot_common.BuildStep('Copy make OS helpers') @@ -668,7 +672,7 @@ def main(args): BuildUpdater() # start local server sharing a manifest + the new bundle - if not skip_test_updater: + if not skip_test_updater and not skip_tar: buildbot_common.BuildStep('Move bundle to localserver dir') buildbot_common.MakeDir(SERVER_DIR) buildbot_common.Move(tarfile, SERVER_DIR) |