diff options
author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-11 00:28:35 +0000 |
---|---|---|
committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-11 00:28:35 +0000 |
commit | 50f36a015a0c28bebebb7ae41a89d1f5b0e32eda (patch) | |
tree | 640321d34811d1b43b1308f76c2aae5a28b4ab8e /build | |
parent | 0e275e143749857bbfc4dbe9d15c46ca184a4942 (diff) | |
download | chromium_src-50f36a015a0c28bebebb7ae41a89d1f5b0e32eda.zip chromium_src-50f36a015a0c28bebebb7ae41a89d1f5b0e32eda.tar.gz chromium_src-50f36a015a0c28bebebb7ae41a89d1f5b0e32eda.tar.bz2 |
envsetup: Unbreak android_gyp for a while.
r262292 accidentally broke android_gyp. Unbreak it for a while, by using
an env var with a long name that hopefully nobody will refer to from anywhere
in the 3-4 weeks it's going to be in the tree.
BUG=330631
NOTRY=true
Review URL: https://codereview.chromium.org/234223002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@263143 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
-rwxr-xr-x | build/android/envsetup.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/build/android/envsetup.sh b/build/android/envsetup.sh index 33247a2..375ef67 100755 --- a/build/android/envsetup.sh +++ b/build/android/envsetup.sh @@ -46,10 +46,12 @@ android_envsetup_main() { # Add Chromium Android development scripts to system path. # Must be after CHROME_SRC is set. export PATH=$PATH:${CHROME_SRC}/build/android + + export ENVSETUP_GYP_CHROME_SRC=${CHROME_SRC} # TODO(thakis): Remove. } android_envsetup_main android_gyp() { echo "Please call build/gyp_chromium instead. android_gyp is going away." - "${CHROME_SRC}/build/gyp_chromium" --depth="${CHROME_SRC}" --check "$@" + "${ENVSETUP_GYP_CHROME_SRC}/build/gyp_chromium" --depth="${ENVSETUP_GYP_CHROME_SRC}" --check "$@" } |