diff options
author | Jean-Baptiste Queru <jbq@google.com> | 2012-03-28 09:44:49 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-03-28 09:44:49 -0700 |
commit | 61126f3c929aa80d06da92bf3ef944f7a093e187 (patch) | |
tree | 9607819e8a84e4b627e9f2115dd143e8fc0b97d3 /self-extractors/generate-packages.sh | |
parent | 87f8d661b3330fc8da5362a70a86d3807be2c728 (diff) | |
parent | 8d3fceb7cfe63a1e72f6ea0b304ee703300a7ad1 (diff) | |
download | device_samsung_maguro-61126f3c929aa80d06da92bf3ef944f7a093e187.zip device_samsung_maguro-61126f3c929aa80d06da92bf3ef944f7a093e187.tar.gz device_samsung_maguro-61126f3c929aa80d06da92bf3ef944f7a093e187.tar.bz2 |
am 8d3fceb7: organize scripts with per-version sections to avoid merge conflicts
* commit '8d3fceb7cfe63a1e72f6ea0b304ee703300a7ad1':
organize scripts with per-version sections to avoid merge conflicts
Diffstat (limited to 'self-extractors/generate-packages.sh')
-rwxr-xr-x | self-extractors/generate-packages.sh | 9 |
1 files 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 |