From 8d3fceb7cfe63a1e72f6ea0b304ee703300a7ad1 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Queru <jbq@google.com>
Date: Wed, 28 Mar 2012 09:29:13 -0700
Subject: organize scripts with per-version sections to avoid merge conflicts

Change-Id: I362bea7c4c4e92d2f0062ebb79e3274e7cffc4a6
---
 self-extractors/generate-packages.sh | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/self-extractors/generate-packages.sh b/self-extractors/generate-packages.sh
index 4c30dec..8ff87da 100755
--- a/self-extractors/generate-packages.sh
+++ b/self-extractors/generate-packages.sh
@@ -25,8 +25,13 @@
 # 257829 = IMM30B
 # 262866 = IMM30D
 # 299849 = IMM76D
-ZIP=yakju-ota-299849.zip
-BUILD=imm76d
+# end ics-mr1
+BRANCH=ics-mr1
+if test $BRANCH=ics-mr1
+then
+  ZIP=yakju-ota-299849.zip
+  BUILD=imm76d
+fi # ics-mr1
 ROOTDEVICE=maguro
 DEVICE=maguro
 MANUFACTURER=samsung
-- 
cgit v1.1