From 4a4110b741e1689f35f9c2087dae3028416b4075 Mon Sep 17 00:00:00 2001 From: Ryan Cui Date: Wed, 17 Aug 2011 17:58:52 -0700 Subject: [PATCH] Use absolute path to chrome_set_ver. So that users don't need to run gclient to update depot_tools when they are developing for chrome in the chroot (i.e., using cros_workon and emerge), since they don't need to run chrome_set_ver manually. Developing for chrome outside of the chroot (running 'make' by themselves) still requires the user to run chrome_set_ver manually after a repo sync. So they also need to run gclient to get the chrome_set_ver symlink. BUG=chromium-os:19112 TEST=ran cros_workon start chromeos-chrome Change-Id: I93a6db4930ccacfa859d83d8fb19ec45b594dd31 Reviewed-on: http://gerrit.chromium.org/gerrit/6201 Reviewed-by: Zdenek Behan Tested-by: Ryan Cui --- cros_workon | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cros_workon b/cros_workon index 65de881e4e..385c940b19 100755 --- a/cros_workon +++ b/cros_workon @@ -71,10 +71,12 @@ WORKON_DIR=${CHROOT_TRUNK_DIR}/.config/cros_workon KEYWORDS_DIR=${BOARD_DIR}/etc/portage/package.keywords UNMASK_DIR=${BOARD_DIR}/etc/portage/package.unmask PACKAGE_ENV_DIR=${BOARD_DIR}/etc/portage/env +CHROMITE_DIR=${CHROOT_TRUNK_DIR}/chromite WORKON_FILE=${WORKON_DIR}/${FLAGS_board:-host} KEYWORDS_FILE=${KEYWORDS_DIR}/cros-workon UNMASK_FILE=${UNMASK_DIR}/cros-workon CHROME_ATOM=chromeos-base/chromeos-chrome +CHROME_SET_VER=${CHROMITE_DIR}/bin/chrome_set_ver.py # TODO(msb): remove the backward compatibility after 10/01/2010 if [ -d "${WORKON_DIR}" ]; then @@ -251,7 +253,7 @@ CHROME_ORIGIN=GERRIT_SOURCE EOF # Run chrome_set_ver to set DEPS info "Setting Chrome dependencies to the correct revision." - chrome_set_ver + ${CHROME_SET_VER} } chrome_to_stable () {