From 0ddc35067b0115ecd2c3c8bf71ac4cc8478d8761 Mon Sep 17 00:00:00 2001
From: Ryan Cui <rcui@google.com>
Date: Fri, 21 Oct 2011 16:03:23 -0700
Subject: [PATCH] Don't set CHROME_ORIGIN environment variable

CL http://gerrit.chromium.org/gerrit/#change,10530 removes dependency of
chrome ebuild on CHROME_ORIGIN being set to GERRIT_SOURCE when user runs
cros_workon.  So remove this functionality.

BUG=chromium-os:21969
TEST=Ran cros_workon start/stop for chrome and cros-devutil

Change-Id: I04f7093b45f8e2871f369331bdafbba36443e21d
Reviewed-on: http://gerrit.chromium.org/gerrit/10531
Reviewed-by: David James <davidjames@chromium.org>
Commit-Ready: Ryan Cui <rcui@chromium.org>
Tested-by: Ryan Cui <rcui@chromium.org>
---
 cros_workon | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/cros_workon b/cros_workon
index ce7a983c3f..ee4d925f3d 100755
--- a/cros_workon
+++ b/cros_workon
@@ -70,7 +70,6 @@ fi
 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
@@ -259,23 +258,11 @@ regen_manifest_and_sync() {
 
 chrome_to_live () {
   # Switch to using repo manifest checkout of chromium src.
-  # TODO(rcui): Remove this when CHROME_ORIGIN defaults to GERRIT_SOURCE.
-  # Tracked in chromium-os:19259.
-  env_dir=${PACKAGE_ENV_DIR}/chromeos-base
-  sudo mkdir -p ${env_dir}
-  sudo_clobber "${env_dir}/chromeos-chrome" <<EOF
-CHROME_ORIGIN=GERRIT_SOURCE
-EOF
   # Run chrome_set_ver to set DEPS
   info "Setting Chrome dependencies to the correct revision."
   ${CHROME_SET_VER}
 }
 
-chrome_to_stable () {
-  env_file=${PACKAGE_ENV_DIR}/${CHROME_ATOM}
-  sudo rm ${env_file}
-}
-
 # Move a stable ebuild to the live development catgeory.  The ebuild
 # src_unpack step fetches the package source for local development.
 ebuild_to_live () {
@@ -309,11 +296,6 @@ ebuild_to_stable () {
     if grep -qx "=${atom}-9999" "${WORKON_FILE}" ; then
       if sudo sed -e "/^=${atom/\//\\/}-9999\$/d" -i "${WORKON_FILE}"; then
         atoms_success="${atoms_success} ${atom}"
-        # TODO(rcui): Remove special case when CHROME_ORIGIN defaults to
-        # GERRIT_SOURCE. Tracked in chromium-os:19259.
-        if [ "${atom}" = "${CHROME_ATOM}" ]; then
-          chrome_to_stable
-        fi
       fi
     else
       warn "Not working on ${atom}"