summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2012-03-28 09:44:48 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-03-28 09:44:48 -0700
commit659e4d73fadbf5771639cdd4eb30dceb9edb65f1 (patch)
tree0cf9b97a6708f097c18108b745425cff45415b9d
parentad598fd059c80156baacf2bc6e655d6e301c8952 (diff)
parentc35ffb8e9d661e9b00d7fb0e45a66de2a8a50dd0 (diff)
downloadcrespo4g-659e4d73fadbf5771639cdd4eb30dceb9edb65f1.tar.gz
am c35ffb8e: organize scripts with per-version sections to avoid merge conflicts
* commit 'c35ffb8e9d661e9b00d7fb0e45a66de2a8a50dd0': organize scripts with per-version sections to avoid merge conflicts
-rwxr-xr-xself-extractors/generate-packages.sh9
1 files changed, 7 insertions, 2 deletions
diff --git a/self-extractors/generate-packages.sh b/self-extractors/generate-packages.sh
index 1ec8b08..7849ff9 100755
--- a/self-extractors/generate-packages.sh
+++ b/self-extractors/generate-packages.sh
@@ -25,8 +25,13 @@
# 239410 = IML74K
# 262866 = IMM30D
# 299849 = IMM76D
-ZIP=sojus-ota-299849.zip
-BUILD=imm76d
+# end ics-mr1
+BRANCH=ics-mr1
+if test $BRANCH=ics-mr1
+then
+ ZIP=sojus-ota-299849.zip
+ BUILD=imm76d
+fi # ics-mr1
ROOTDEVICE=crespo
DEVICE=crespo4g
MANUFACTURER=samsung