commit b7485bb77fc6a403010fabd2b280d6ae1f681125
author Alex Klein <saklein@chromium.org> Thu Sep 19 13:23:37 2019 -0600
committer Commit Bot <commit-bot@chromium.org> Fri Sep 20 04:58:48 2019 +0000
tree 6176dce2e9176014996e720d1bab538386206f5b
parent b8a57b5c3bcd1fc108ae05e16e99e1ce9076933e

Build API: Add CHROME_ORIGIN env var when chrome root set.

BUG=chromium:950006
TEST=./run_tests

Change-Id: I976ef362b7abf163cd8fbd324bfa3a3f34c30704
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/1815067
Commit-Queue: Alex Klein <saklein@chromium.org>
Commit-Queue: David Burger <dburger@chromium.org>
Tested-by: Alex Klein <saklein@chromium.org>
Tested-by: David Burger <dburger@chromium.org>
Reviewed-by: David Burger <dburger@chromium.org>

api/controller/controller_util.py

diff --git a/api/controller/controller_util.py b/api/controller/controller_util.py
index 861e452..fa22fbf 100644
--- a/api/controller/controller_util.py
+++ b/api/controller/controller_util.py
@@ -47,6 +47,10 @@
   if use_flags:
     env['USE'] = ' '.join(use_flags)
 
+  # Make sure it'll use the local source to build chrome when we have it.
+  if chrome_root:
+    env['CHROME_ORIGIN'] = 'LOCAL_SOURCE'
+
   # TODO(saklein) Remove the default when fully integrated in recipes.
   env['FEATURES'] = 'separatedebug'
   if features: