commit 331f982a71b475935cc050742955d5cbc125c2ac
author Zdenek Behan <zbehan@chromium.org> Fri Apr 13 05:02:36 2012 +0200
committer Gerrit <chrome-bot@google.com> Thu Apr 12 20:57:01 2012 -0700
tree 1a7554f90c1e42861ce6f43c5531feab6b416884
parent 39bdbbf1f7b446663c57e33bf81b0b3a5a6e434a

cros_setup_toolchains: use the cros_overlay_list from platform/dev

Using the one installed in chroot is unsafe.

BUG=none
TEST=use it and see it still work!

Change-Id: I2e4470f396fd5006c1be81e10383edf2ed28209c
Reviewed-on: https://gerrit.chromium.org/gerrit/20184
Reviewed-by: David James <davidjames@chromium.org>
Commit-Ready: Zdenek Behan <zbehan@chromium.org>
Tested-by: Zdenek Behan <zbehan@chromium.org>

scripts/cros_setup_toolchains.py

diff --git a/scripts/cros_setup_toolchains.py b/scripts/cros_setup_toolchains.py
index 4802329..4b6a658 100644
--- a/scripts/cros_setup_toolchains.py
+++ b/scripts/cros_setup_toolchains.py
@@ -24,8 +24,10 @@
 import portage
 
 
-EMERGE_CMD = os.path.join(os.path.dirname(__file__),
-                          '../bin', 'parallel_emerge')
+EMERGE_CMD = os.path.join(
+    constants.SOURCE_ROOT, 'chromite/bin/parallel_emerge')
+CROS_OVERLAY_LIST_CMD = os.path.join(
+    constants.SOURCE_ROOT, 'src/platform/dev/host/cros_overlay_list')
 PACKAGE_STABLE = '[stable]'
 PACKAGE_NONE = '[none]'
 SRC_ROOT = os.path.realpath(constants.SOURCE_ROOT)
@@ -172,7 +174,7 @@
 
   returns the list of cross targets for the current tree
   """
-  cmd = ['cros_overlay_list', '--all_boards']
+  cmd = [CROS_OVERLAY_LIST_CMD, '--all_boards']
   overlays = cros_build_lib.RunCommand(cmd, print_cmd=False,
                                        redirect_stdout=True).output.splitlines()
   targets = set()