diff options
| author | elijahtaylor@chromium.org <elijahtaylor@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-23 23:51:10 +0000 |
|---|---|---|
| committer | elijahtaylor@chromium.org <elijahtaylor@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-23 23:51:10 +0000 |
| commit | ac5520d8a6cf85439fd925283c1387faf5d5827d (patch) | |
| tree | b6dcada7406420544f7115e503c5c982b6c44549 /native_client_sdk | |
| parent | d7e321cc68d6b5911c1f0bda2271c31089581f8a (diff) | |
| download | chromium_src-ac5520d8a6cf85439fd925283c1387faf5d5827d.zip chromium_src-ac5520d8a6cf85439fd925283c1387faf5d5827d.tar.gz chromium_src-ac5520d8a6cf85439fd925283c1387faf5d5827d.tar.bz2 | |
[NaCl SDK] Fix module imports for mono bots
These were recently changed in the NaCl SDK but were not
accounted for in the mono scripts.
TEST=None
BUG=None
Review URL: https://chromiumcodereview.appspot.com/14054006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@195941 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'native_client_sdk')
| -rwxr-xr-x | native_client_sdk/src/build_tools/nacl-mono-buildbot.py | 3 | ||||
| -rwxr-xr-x | native_client_sdk/src/build_tools/nacl-mono-builder.py | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/native_client_sdk/src/build_tools/nacl-mono-buildbot.py b/native_client_sdk/src/build_tools/nacl-mono-buildbot.py index 5bfba9f..5d7d28c 100755 --- a/native_client_sdk/src/build_tools/nacl-mono-buildbot.py +++ b/native_client_sdk/src/build_tools/nacl-mono-buildbot.py @@ -10,6 +10,7 @@ import sys import buildbot_common import build_utils +from build_paths import SCRIPT_DIR GS_MANIFEST_PATH = 'gs://nativeclient-mirror/nacl/nacl_sdk/' SDK_MANIFEST = 'naclsdk_manifest2.json' @@ -163,7 +164,7 @@ def main(args): buildbot_revision = os.environ.get('BUILDBOT_REVISION', '') buildername = os.environ.get('BUILDBOT_BUILDERNAME', '') - os.chdir(buildbot_common.SCRIPT_DIR) + os.chdir(SCRIPT_DIR) if buildername == 'linux-sdk-mono32': assert buildbot_revision diff --git a/native_client_sdk/src/build_tools/nacl-mono-builder.py b/native_client_sdk/src/build_tools/nacl-mono-builder.py index 0726111..e6fece3 100755 --- a/native_client_sdk/src/build_tools/nacl-mono-builder.py +++ b/native_client_sdk/src/build_tools/nacl-mono-builder.py @@ -9,8 +9,9 @@ import sys import tarfile import buildbot_common +from build_paths import SCRIPT_DIR -SDK_BUILD_DIR = buildbot_common.SCRIPT_DIR +SDK_BUILD_DIR = SCRIPT_DIR MONO_BUILD_DIR = os.path.join(SDK_BUILD_DIR, 'mono_build') MONO_DIR = os.path.join(MONO_BUILD_DIR, 'nacl-mono') |