Add the ability to unlock the bootloader before doing anything else

Change-Id: I9fbd5237fc40216de5b1141219d3ab169eef0637

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 DEVICE
@@ -28,4 +25,8 @@ unset RADIOFILE
 unset RADIOSRC
 unset SLEEPDURATION
 unset SRCPREFIX
+unset UNLOCKBOOTLOADER
 unset VERSION
+unset TWINBOOTLOADERS
+unset XLOADER
+unset XLOADERSRC

generate-factory-images-common.sh

@@ -97,6 +97,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
@@ -166,6 +172,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