diff options
| author | sbc <sbc@chromium.org> | 2015-06-30 12:14:23 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-06-30 19:15:31 +0000 |
| commit | 8208b4d81396c11e1f8ca8f6ffe52b9fcea87d05 (patch) | |
| tree | e2c8ee7873bf32cec3fd39c0e06e9db56ea7a805 /native_client_sdk | |
| parent | 5c8510d1c1078e82357005cf56f0af8acde0c168 (diff) | |
| download | chromium_src-8208b4d81396c11e1f8ca8f6ffe52b9fcea87d05.zip chromium_src-8208b4d81396c11e1f8ca8f6ffe52b9fcea87d05.tar.gz chromium_src-8208b4d81396c11e1f8ca8f6ffe52b9fcea87d05.tar.bz2 | |
Move linux sysroots from chrome/installer/linux to build/linux
The sysroot are generally useful (for example when
cross compiling) and not limited to use in the installer
or official releases.
Another reason to move this is that it would allow other
projects to more easily share chromium's build setup
without depending on chrome/.
Also, rename the install script to simply install-sysroot.
This way the script can keep the same name and support
multiple different debian releases without needing
to duplicate the script (e.g. when we switch to jessie).
BUG=504446
TEST=cross build chromium for arm and ia32
Review URL: https://codereview.chromium.org/1141003002
Cr-Commit-Position: refs/heads/master@{#336843}
Diffstat (limited to 'native_client_sdk')
| -rwxr-xr-x | native_client_sdk/src/build_tools/build_sdk.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/native_client_sdk/src/build_tools/build_sdk.py b/native_client_sdk/src/build_tools/build_sdk.py index fbf5586..4748b78 100755 --- a/native_client_sdk/src/build_tools/build_sdk.py +++ b/native_client_sdk/src/build_tools/build_sdk.py @@ -1088,9 +1088,8 @@ def main(args): if platform == 'linux': # Linux-only: make sure the debian/stable sysroot image is installed - install_script = os.path.join(SRC_DIR, 'chrome', 'installer', 'linux', - 'sysroot_scripts', - 'install-debian.wheezy.sysroot.py') + install_script = os.path.join(SRC_DIR, 'build', 'linux', 'sysroot_scripts', + 'install-sysroot.py') buildbot_common.Run([sys.executable, install_script, '--arch=arm']) buildbot_common.Run([sys.executable, install_script, '--arch=i386']) |