diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-09-11 14:18:35 -0700 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2012-09-11 14:18:41 -0700 |
| commit | fdec704440f280585f7558fc03564cfc9d893c02 (patch) | |
| tree | 341338623619154ab2c1debe76b8aa3d0d03d37a /generate-factory-images-common.sh | |
| parent | 5786ad576a3ed18348410f5b60df4c8fe3b2327f (diff) | |
| download | android_device_common-fdec704440f280585f7558fc03564cfc9d893c02.tar.gz android_device_common-fdec704440f280585f7558fc03564cfc9d893c02.tar.bz2 android_device_common-fdec704440f280585f7558fc03564cfc9d893c02.zip | |
Handle radios in separate files
Change-Id: I2c9c9fd1a3980f6243f1069c1c0df3092462e2eb
Diffstat (limited to 'generate-factory-images-common.sh')
| -rw-r--r-- | generate-factory-images-common.sh | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/generate-factory-images-common.sh b/generate-factory-images-common.sh index d6674bc..c811bb6 100644 --- a/generate-factory-images-common.sh +++ b/generate-factory-images-common.sh @@ -1,4 +1,4 @@ -# Copyright (C) 2011 The Android Open Source Project +# Copyright 2011 The Android Open Source Project # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -26,11 +26,11 @@ if test "$BOOTLOADERFILE" = "" then unzip -d tmp ${SRCPREFIX}$PRODUCT-target_files-$BUILD.zip RADIO/$BOOTLOADERSRC fi -if test "$RADIO" != "" +if test "$RADIO" != "" -a "$RADIOFILE" = "" then unzip -d tmp ${SRCPREFIX}$PRODUCT-target_files-$BUILD.zip RADIO/$RADIOSRC fi -if test "$CDMARADIO" != "" +if test "$CDMARADIO" != "" -a "$CDMARADIOFILE" = "" then unzip -d tmp ${SRCPREFIX}$PRODUCT-target_files-$BUILD.zip RADIO/radio-cdma.img fi @@ -43,11 +43,21 @@ else fi if test "$RADIO" != "" then - cp tmp/RADIO/$RADIOSRC tmp/$PRODUCT-$VERSION/radio-$DEVICE-$RADIO.img + if test "$RADIOFILE" = "" + then + cp tmp/RADIO/$RADIOSRC tmp/$PRODUCT-$VERSION/radio-$DEVICE-$RADIO.img + else + cp $RADIOFILE tmp/$PRODUCT-$VERSION/radio-$DEVICE-$RADIO.img + fi fi if test "$CDMARADIO" != "" then - cp tmp/RADIO/radio-cdma.img tmp/$PRODUCT-$VERSION/radio-cdma-$DEVICE-$CDMARADIO.img + if test "$CDMARADIOFILE" = "" + then + cp tmp/RADIO/radio-cdma.img tmp/$PRODUCT-$VERSION/radio-cdma-$DEVICE-$CDMARADIO.img + else + cp $CDMARADIOFILE tmp/$PRODUCT-$VERSION/radio-cdma-$DEVICE-$CDMARADIO.img + fi fi if test "$SLEEPDURATION" = "" then @@ -56,7 +66,7 @@ fi cat > tmp/$PRODUCT-$VERSION/flash-all.sh << EOF #!/bin/sh -# Copyright (C) 2011 The Android Open Source Project +# Copyright 2012 The Android Open Source Project # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -165,7 +175,7 @@ EOF cat > tmp/$PRODUCT-$VERSION/flash-base.sh << EOF #!/bin/sh -# Copyright (C) 2011 The Android Open Source Project +# Copyright 2012 The Android Open Source Project # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. |