diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-11-28 13:55:01 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-11-28 13:55:01 -0800 |
| commit | 1a5507e5f7f434e5a15ef91971cd40d90bdf75d5 (patch) | |
| tree | d59a0e0c11632ed5db6f2624dd9c8fc50bfbe959 | |
| parent | 766a91e79652e2dac045ab1d05200ad36563f0db (diff) | |
| parent | 3a182ec19f708859b672cbea69d9a749297244d8 (diff) | |
| download | android_device_common-1a5507e5f7f434e5a15ef91971cd40d90bdf75d5.tar.gz android_device_common-1a5507e5f7f434e5a15ef91971cd40d90bdf75d5.tar.bz2 android_device_common-1a5507e5f7f434e5a15ef91971cd40d90bdf75d5.zip | |
am 3a182ec1: Merge "Add the ability to unlock the bootloader before doing anything else"
* commit '3a182ec19f708859b672cbea69d9a749297244d8':
Add the ability to unlock the bootloader before doing anything else
| -rw-r--r-- | clear-factory-images-variables.sh | 7 | ||||
| -rw-r--r-- | generate-factory-images-common.sh | 12 |
2 files changed, 16 insertions, 3 deletions
diff --git a/clear-factory-images-variables.sh b/clear-factory-images-variables.sh index bae0abb..dc508e1 100644 --- a/clear-factory-images-variables.sh +++ b/clear-factory-images-variables.sh @@ -12,12 +12,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -unset XLOADER -unset XLOADERSRC unset BOOTLOADER unset BOOTLOADERFILE unset BOOTLOADERSRC -unset TWINBOOTLOADERS unset BUILD unset CDMARADIO unset CDMARADIOFILE @@ -30,4 +27,8 @@ unset RADIOSRC unset RADIOFILE unset SLEEPDURATION unset SRCPREFIX +unset UNLOCKBOOTLOADER unset VERSION +unset TWINBOOTLOADERS +unset XLOADER +unset XLOADERSRC diff --git a/generate-factory-images-common.sh b/generate-factory-images-common.sh index 241ecd7..63ab260 100644 --- a/generate-factory-images-common.sh +++ b/generate-factory-images-common.sh @@ -102,6 +102,12 @@ cat > tmp/$PRODUCT-$VERSION/flash-all.sh << EOF # limitations under the License. EOF +if test "$UNLOCKBOOTLOADER" = "true" +then +cat >> tmp/$PRODUCT-$VERSION/flash-all.sh << EOF +fastboot oem unlock +EOF +fi if test "$ERASEALL" = "true" then cat >> tmp/$PRODUCT-$VERSION/flash-all.sh << EOF @@ -171,6 +177,12 @@ cat > tmp/$PRODUCT-$VERSION/flash-all.bat << EOF PATH=%PATH%;"%SYSTEMROOT%\System32" EOF +if test "$UNLOCKBOOTLOADER" = "true" +then +cat >> tmp/$PRODUCT-$VERSION/flash-all.bat << EOF +fastboot oem unlock +EOF +fi if test "$ERASEALL" = "true" then cat >> tmp/$PRODUCT-$VERSION/flash-all.bat << EOF |