diff options
author | Jean-Baptiste Queru <jbq@google.com> | 2012-03-28 10:10:44 -0700 |
---|---|---|
committer | Jean-Baptiste Queru <jbq@google.com> | 2012-03-28 10:10:44 -0700 |
commit | 7c5ff4a1680e99badfb4e2fd07aa7a934bc5b8fc (patch) | |
tree | c98ab84b5e71fe8c594b2e1fa7e86518992bdca5 /self-extractors | |
parent | 4555fd13dbaaf208f4fdeec02b4c86a2087ab9d0 (diff) | |
parent | 61126f3c929aa80d06da92bf3ef944f7a093e187 (diff) | |
download | device_samsung_maguro-7c5ff4a1680e99badfb4e2fd07aa7a934bc5b8fc.zip device_samsung_maguro-7c5ff4a1680e99badfb4e2fd07aa7a934bc5b8fc.tar.gz device_samsung_maguro-7c5ff4a1680e99badfb4e2fd07aa7a934bc5b8fc.tar.bz2 |
resolved conflicts for merge of 61126f3c to master
Change-Id: Ie4d54ba264f221b124ea0468dd78b63fe66e58ed
Diffstat (limited to 'self-extractors')
-rwxr-xr-x | self-extractors/generate-packages.sh | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/self-extractors/generate-packages.sh b/self-extractors/generate-packages.sh index fd8a7e2..52856ec 100755 --- a/self-extractors/generate-packages.sh +++ b/self-extractors/generate-packages.sh @@ -25,10 +25,22 @@ # 257829 = IMM30B # 262866 = IMM30D # 299849 = IMM76D +# end ics-mr1 +# start jellybean # 241580 = IRL89 # 241968 = IRM03 -ZIP=yakju-ota-241968.zip -BUILD=irm03 +# end jellybean +BRANCH=jellybean +if test $BRANCH=ics-mr1 +then + ZIP=yakju-ota-299849.zip + BUILD=imm76d +fi # ics-mr1 +if test $BRANCH=jellybean +then + ZIP=yakju-ota-241968.zip + BUILD=irm03 +fi # jellybean ROOTDEVICE=maguro DEVICE=maguro MANUFACTURER=samsung |