Remove provision for sideload

* And make overriding of provision script generated

build/meta/com/google/android/update-binary

@@ -71,6 +71,7 @@ cd /tmp
 unzip -o "$ZIP"
 exec_util "rm -rf META-INF"
 cd system
+
 if [ "$MEM" -lt "$LOWMEM" ]; then
   ui_print "Low RAM device detected, removing large extras"
   exec_util "rm -rf priv-app/SetupWizard"
@@ -103,6 +104,7 @@ for dirs in $DIRS; do
 done
 ui_print "Copying files"
 exec_util "cp --preserve=a -r ./* $SYSTEM/"
+exec_util "rm -rf $SYSTEM/priv-app/Provision/"
 ui_print "Cleaning up files"
 cd ../
 exec_util "rm -rf system/"

common/Android.mk

@@ -150,8 +150,8 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := SetupWizard
 LOCAL_MODULE_OWNER := gapps
 LOCAL_SRC_FILES := proprietary/priv-app/SetupWizard/SetupWizard.apk
-LOCAL_CERTIFICATE := PRESIGNED
 LOCAL_OVERRIDES_PACKAGES := Provision
+LOCAL_CERTIFICATE := PRESIGNED
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := APPS
 LOCAL_DEX_PREOPT := false

setup-makefiles.sh

@@ -54,6 +54,9 @@ echo "endif" >> "$ANDROIDMK"
 
 sed -i 's/TARGET_DEVICE/TARGET_ARCH/g' "$ANDROIDMK"
 
+# Make Google SuW override Provision
+sed -i 's/\(SetupWizard.apk\)/\1\nLOCAL_OVERRIDES_PACKAGES := Provision/' "$ANDROIDMK"
+
 # We are done with common
 write_footers