diff options
| author | mahesh.kk@samsung.com <mahesh.kk@samsung.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-23 21:07:21 +0000 |
|---|---|---|
| committer | mahesh.kk@samsung.com <mahesh.kk@samsung.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-23 21:07:21 +0000 |
| commit | 9c1ddc500c6f7a50d1219ad1d0ea1393df84a5d8 (patch) | |
| tree | d415661b8f4e7e3bbfdf19b1f9a93c8e59c2f9e0 /build | |
| parent | 98a04479ee51a879e6ab8e7e07e3544d33f62969 (diff) | |
| download | chromium_src-9c1ddc500c6f7a50d1219ad1d0ea1393df84a5d8.zip chromium_src-9c1ddc500c6f7a50d1219ad1d0ea1393df84a5d8.tar.gz chromium_src-9c1ddc500c6f7a50d1219ad1d0ea1393df84a5d8.tar.bz2 | |
Skip downloading of nacl toolchain for android.
Nacl is not enabled in android and it takes too long to download the toolchain.
BUG=329646
Review URL: https://codereview.chromium.org/116833006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242405 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rwxr-xr-x | build/android/envsetup_functions.sh | 3 | ||||
| -rwxr-xr-x | build/download_nacl_toolchains.py | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/build/android/envsetup_functions.sh b/build/android/envsetup_functions.sh index bf8abb6..2c50cfe 100755 --- a/build/android/envsetup_functions.sh +++ b/build/android/envsetup_functions.sh @@ -132,6 +132,9 @@ ${ANDROID_SDK_BUILD_TOOLS_VERSION} print_usage return 1 esac + + # nacl isn't enabled for android, avoid downloading the toolchain. + DEFINES+=" -Ddisable_nacl=1" } diff --git a/build/download_nacl_toolchains.py b/build/download_nacl_toolchains.py index 3a4cb1b..379e78a 100755 --- a/build/download_nacl_toolchains.py +++ b/build/download_nacl_toolchains.py @@ -12,6 +12,7 @@ import sys def Main(args): # Exit early if disable_nacl=1. if 'disable_nacl=1' in os.environ.get('GYP_DEFINES', ''): + print 'NACL is disabled. Skipping NativeClient toolchain download.' return 0 script_dir = os.path.dirname(os.path.abspath(__file__)) src_dir = os.path.dirname(script_dir) |