Factory images: erase all partitions.

Change-Id: Iaa3248fabeaf976060c4c512c862cb88aae5c26d
diff --git a/clear-factory-images-variables.sh b/clear-factory-images-variables.sh
index 312f195..e0c6758 100644
--- a/clear-factory-images-variables.sh
+++ b/clear-factory-images-variables.sh
@@ -17,8 +17,11 @@
 unset BOOTLOADERSRC
 unset BUILD
 unset CDMARADIO
+unset DEVICE
+unset ERASE
 unset PRODUCT
 unset RADIO
 unset RADIOSRC
+unset SLEEPDURATION
 unset SRCPREFIX
 unset VERSION
diff --git a/generate-factory-images-common.sh b/generate-factory-images-common.sh
index 5d06a09..a82e3d2 100644
--- a/generate-factory-images-common.sh
+++ b/generate-factory-images-common.sh
@@ -70,6 +70,18 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+EOF
+if test "$ERASEALL" = "true"
+then
+cat >> tmp/$PRODUCT-$VERSION/flash-all.sh << EOF
+fastboot erase boot
+fastboot erase cache
+fastboot erase recovery
+fastboot erase system
+fastboot erase userdata
+EOF
+fi
+cat >> tmp/$PRODUCT-$VERSION/flash-all.sh << EOF
 fastboot flash bootloader bootloader-$DEVICE-$BOOTLOADER.img
 fastboot reboot-bootloader
 sleep $SLEEPDURATION