diff options
| -rw-r--r-- | clear-factory-images-variables.sh | 2 | ||||
| -rwxr-xr-x | generate-blob-lists.sh | 2 | ||||
| -rw-r--r-- | generate-factory-images-common.sh | 13 |
3 files changed, 11 insertions, 6 deletions
diff --git a/clear-factory-images-variables.sh b/clear-factory-images-variables.sh index 2c625a7..dc508e1 100644 --- a/clear-factory-images-variables.sh +++ b/clear-factory-images-variables.sh @@ -17,12 +17,14 @@ unset BOOTLOADERFILE unset BOOTLOADERSRC unset BUILD unset CDMARADIO +unset CDMARADIOFILE unset DEVICE unset ERASE unset PRODUCT unset RADIO unset RADIOFILE unset RADIOSRC +unset RADIOFILE unset SLEEPDURATION unset SRCPREFIX unset UNLOCKBOOTLOADER diff --git a/generate-blob-lists.sh b/generate-blob-lists.sh index 8360da8..79d5055 100755 --- a/generate-blob-lists.sh +++ b/generate-blob-lists.sh @@ -67,10 +67,8 @@ else sort -f > $ARCHIVEDIR/$DEVICENAME-with.txt done rm -rf device/lge/* - rm -rf hardware/broadcom/nfc rm -rf hardware/msm7k rm -rf hardware/qcom/* - rm -rf packages/apps/UnifiedEmail rm -rf vendor for DEVICENAME in $DEVICES do diff --git a/generate-factory-images-common.sh b/generate-factory-images-common.sh index b7c959f..63ab260 100644 --- a/generate-factory-images-common.sh +++ b/generate-factory-images-common.sh @@ -47,7 +47,7 @@ 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 @@ -75,14 +75,19 @@ then 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 # Write flash-all.sh cat > tmp/$PRODUCT-$VERSION/flash-all.sh << EOF #!/bin/sh -# Copyright 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. @@ -235,7 +240,7 @@ EOF cat > tmp/$PRODUCT-$VERSION/flash-base.sh << EOF #!/bin/sh -# Copyright 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. |