From 905f6164a124601ad875c4f7a32f20218547955c Mon Sep 17 00:00:00 2001
From: Chris Sosa <sosa@chromium.org>
Date: Tue, 27 Sep 2011 18:33:41 -0700
Subject: [PATCH] Prefix build folder name with CHROME_BRANCH from
 chromeos_version.sh.

BUG=chromium-os:15703
TEST=Ran build_image saw right folder.

Change-Id: I646dc7f67dac126436e75299e150ee053d25e810
Reviewed-on: http://gerrit.chromium.org/gerrit/8397
Tested-by: Chris Sosa <sosa@chromium.org>
Reviewed-by: Scott Zawalski <scottz@chromium.org>
---
 build_library/build_image_util.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/build_library/build_image_util.sh b/build_library/build_image_util.sh
index 5ac55ea625..f21f54a4d8 100755
--- a/build_library/build_image_util.sh
+++ b/build_library/build_image_util.sh
@@ -11,7 +11,8 @@
 
 # Use canonical path since some tools (e.g. mount) do not like symlinks.
 # Append build attempt to output directory.
-IMAGE_SUBDIR="${CHROMEOS_VERSION_STRING}-a${FLAGS_build_attempt}"
+IMAGE_SUBDIR="${CHROME_BRANCH}-${CHROMEOS_VERSION_STRING}-a\
+${FLAGS_build_attempt}"
 OUTPUT_DIR="${FLAGS_output_root}/${BOARD}/${IMAGE_SUBDIR}"
 OUTSIDE_OUTPUT_DIR="../build/images/${BOARD}/${IMAGE_SUBDIR}"