[Android Software Development] Deltadroid:
Google Play Services

Google Play Services has been updated to version 8.1.05_(2218116-23x)-810523x for lollipop. In addition, some ROMs have known issues replacing their stock Provision setup with Google's setup (ie; MIUI), so, the base gapps installation script has been given a new option to not replace the stock Provision setup with Google's Setupwizard, if the file "/sdcard/.removesetupwizard" exists. In order to restore the stock Provision setup follow these steps:

1) Create the file /sdcard/.removesetupwizard

2) Reboot to recovery and flash the latest base gapps zip

3) After flashing the latest base gapps package, dirty flash your ROM again to restore Provision.apk.

4) Reboot to system (Google's Setup will then not be installed and the original stock Provision setup will be restored).

I have tested removing Google's setupwizard on latest CM12.1 nightly build and it seems to be fine. Please let me know if this fixes or causes any problems.

Lollipop Base Gapps package for 5.0.2: gapps-502-base-20150904-1-signed.zip

Lollipop Base Gapps package for 5.1.1: gapps-511-base-20150904-1-signed.zip

diff -ru '--exclude=CERT.RSA' '--exclude=CERT.SF' '--exclude=MANIFEST.MF' gapps-502-base-20150818-1-signed/META-INF/com/google/android/updater-script gapps-502-base-20150904-1-signed/META-INF/com/google/android/updater-script
--- gapps-502-base-20150818-1-signed/META-INF/com/google/android/updater-script	2008-02-29 02:33:46.000000000 +0100
+++ gapps-502-base-20150904-1-signed/META-INF/com/google/android/updater-script	2008-02-29 02:33:46.000000000 +0100
@@ -8,7 +8,7 @@
show_progress(1, 15);

ui_print("Cleaning system.");
-delete_recursive("/system/app/BrowserProviderProxy","/system/app/PartnerBookmarksProvider","/system/app/Provision","/system/app/FaceLock","/system/app/GoogleCalendarSyncAdapter","/system/app/GoogleContactsSyncAdapter","/system/priv-app/GoogleBackupTransport","/system/priv-app/GoogleFeedback","/system/priv-app/GoogleLoginService","/system/priv-app/GoogleOneTimeInitializer","/system/priv-app/GooglePartnerSetup","/system/priv-app/GoogleServicesFramework","/system/priv-app/Phonesky","/system/priv-app/PrebuiltGmsCore");
+delete_recursive("/system/app/BrowserProviderProxy","/system/app/PartnerBookmarksProvider","/system/app/FaceLock","/system/app/GoogleCalendarSyncAdapter","/system/app/GoogleContactsSyncAdapter","/system/priv-app/GoogleBackupTransport","/system/priv-app/GoogleFeedback","/system/priv-app/GoogleLoginService","/system/priv-app/GoogleOneTimeInitializer","/system/priv-app/GooglePartnerSetup","/system/priv-app/GoogleServicesFramework","/system/priv-app/Phonesky","/system/priv-app/PrebuiltGmsCore");

ui_print("Installing files.");
run_program("/sbin/mkdir", "/tmp/face");
Binary files gapps-502-base-20150818-1-signed/optional/gms/0/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk and gapps-502-base-20150904-1-signed/optional/gms/0/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk differ
Binary files gapps-502-base-20150818-1-signed/optional/gms/4/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk and gapps-502-base-20150904-1-signed/optional/gms/4/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk differ
Binary files gapps-502-base-20150818-1-signed/optional/gms/6/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk and gapps-502-base-20150904-1-signed/optional/gms/6/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk differ
Binary files gapps-502-base-20150818-1-signed/optional/gms/8/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk and gapps-502-base-20150904-1-signed/optional/gms/8/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk differ
diff -ru '--exclude=CERT.RSA' '--exclude=CERT.SF' '--exclude=MANIFEST.MF' gapps-502-base-20150818-1-signed/scripts/install-optional.sh gapps-502-base-20150904-1-signed/scripts/install-optional.sh
--- gapps-502-base-20150818-1-signed/scripts/install-optional.sh	2008-02-29 02:33:46.000000000 +0100
+++ gapps-502-base-20150904-1-signed/scripts/install-optional.sh	2008-02-29 02:33:46.000000000 +0100
@@ -28,13 +28,20 @@

TYPE=$(grep ro.build.characteristics /system/build.prop | grep tablet);

-mkdir /system/priv-app/SetupWizard
-if [ ! "$TYPE" == "" ]; then
- echo "Tablet detected."
- cp -f /tmp/setup/tablet/priv-app/SetupWizard/SetupWizard.apk /system/priv-app/SetupWizard/
+if [ -f /sdcard/.removesetupwizard ]; then
+ rm -rf /system/priv-app/SetupWizard
+ sed -i '/Provision/ d' /system/addon.d/70-gapps.sh
+ sed -i '/SetupWizard/ d' /system/addon.d/70-gapps.sh
else
- echo "Phone detected."
- cp -f /tmp/setup/phone/priv-app/SetupWizard/SetupWizard.apk /system/priv-app/SetupWizard/
+ rm -rf /system/app/Provision
+ mkdir /system/priv-app/SetupWizard
+ if [ ! "$TYPE" == "" ]; then
+ echo "Tablet detected."
+ cp -f /tmp/setup/tablet/priv-app/SetupWizard/SetupWizard.apk /system/priv-app/SetupWizard/
+ else
+ echo "Phone detected."
+ cp -f /tmp/setup/phone/priv-app/SetupWizard/SetupWizard.apk /system/priv-app/SetupWizard/
+ fi
fi
rm -rf /tmp/setup
mkdir /tmp/gms
Binary files gapps-502-base-20150818-1-signed/system/priv-app/PrebuiltGmsCore/lib/arm/libAppDataSearch.so and gapps-502-base-20150904-1-signed/system/priv-app/PrebuiltGmsCore/lib/arm/libAppDataSearch.so differ
Binary files gapps-502-base-20150818-1-signed/system/priv-app/PrebuiltGmsCore/lib/arm/libconscrypt_gmscore_jni.so and gapps-502-base-20150904-1-signed/system/priv-app/PrebuiltGmsCore/lib/arm/libconscrypt_gmscore_jni.so differ
Binary files gapps-502-base-20150818-1-signed/system/priv-app/PrebuiltGmsCore/lib/arm/libdirect-audio.so and gapps-502-base-20150904-1-signed/system/priv-app/PrebuiltGmsCore/lib/arm/libdirect-audio.so differ
Binary files gapps-502-base-20150818-1-signed/system/priv-app/PrebuiltGmsCore/lib/arm/libgcastv2_base.so and gapps-502-base-20150904-1-signed/system/priv-app/PrebuiltGmsCore/lib/arm/libgcastv2_base.so differ
Binary files gapps-502-base-20150818-1-signed/system/priv-app/PrebuiltGmsCore/lib/arm/libgcastv2_support.so and gapps-502-base-20150904-1-signed/system/priv-app/PrebuiltGmsCore/lib/arm/libgcastv2_support.so differ
Binary files gapps-502-base-20150818-1-signed/system/priv-app/PrebuiltGmsCore/lib/arm/libgmscore.so and gapps-502-base-20150904-1-signed/system/priv-app/PrebuiltGmsCore/lib/arm/libgmscore.so differ
Binary files gapps-502-base-20150818-1-signed/system/priv-app/PrebuiltGmsCore/lib/arm/libgms-ocrclient.so and gapps-502-base-20150904-1-signed/system/priv-app/PrebuiltGmsCore/lib/arm/libgms-ocrclient.so differ
Binary files gapps-502-base-20150818-1-signed/system/priv-app/PrebuiltGmsCore/lib/arm/libjgcastservice.so and gapps-502-base-20150904-1-signed/system/priv-app/PrebuiltGmsCore/lib/arm/libjgcastservice.so differ
Binary files gapps-502-base-20150818-1-signed/system/priv-app/PrebuiltGmsCore/lib/arm/libleveldbjni.so and gapps-502-base-20150904-1-signed/system/priv-app/PrebuiltGmsCore/lib/arm/libleveldbjni.so differ
Binary files gapps-502-base-20150818-1-signed/system/priv-app/PrebuiltGmsCore/lib/arm/libNearbyApp.so and gapps-502-base-20150904-1-signed/system/priv-app/PrebuiltGmsCore/lib/arm/libNearbyApp.so differ
Binary files gapps-502-base-20150818-1-signed/system/priv-app/PrebuiltGmsCore/lib/arm/libsslwrapper_jni.so and gapps-502-base-20150904-1-signed/system/priv-app/PrebuiltGmsCore/lib/arm/libsslwrapper_jni.so differ
Binary files gapps-502-base-20150818-1-signed/system/priv-app/PrebuiltGmsCore/lib/arm/libwearable-selector.so and gapps-502-base-20150904-1-signed/system/priv-app/PrebuiltGmsCore/lib/arm/libwearable-selector.so differ
Binary files gapps-502-base-20150818-1-signed/system/priv-app/PrebuiltGmsCore/lib/arm/libWhisper.so and gapps-502-base-20150904-1-signed/system/priv-app/PrebuiltGmsCore/lib/arm/libWhisper.so differ

diff -ru '--exclude=CERT.RSA' '--exclude=CERT.SF' '--exclude=MANIFEST.MF' gapps-511-base-20150818-1-signed/META-INF/com/google/android/updater-script gapps-511-base-20150904-1-signed/META-INF/com/google/android/updater-script
--- gapps-511-base-20150818-1-signed/META-INF/com/google/android/updater-script	2008-02-29 02:33:46.000000000 +0100
+++ gapps-511-base-20150904-1-signed/META-INF/com/google/android/updater-script	2008-02-29 02:33:46.000000000 +0100
@@ -8,7 +8,7 @@
show_progress(1, 15);

ui_print("Cleaning system.");
-delete_recursive("/system/app/BrowserProviderProxy","/system/app/PartnerBookmarksProvider","/system/app/Provision","/system/app/FaceLock","/system/app/GoogleCalendarSyncAdapter","/system/app/GoogleContactsSyncAdapter","/system/priv-app/GoogleBackupTransport","/system/priv-app/GoogleFeedback","/system/priv-app/GoogleLoginService","/system/priv-app/GoogleOneTimeInitializer","/system/priv-app/GooglePartnerSetup","/system/priv-app/GoogleServicesFramework","/system/priv-app/Phonesky","/system/priv-app/PrebuiltGmsCore");
+delete_recursive("/system/app/BrowserProviderProxy","/system/app/PartnerBookmarksProvider","/system/app/FaceLock","/system/app/GoogleCalendarSyncAdapter","/system/app/GoogleContactsSyncAdapter","/system/priv-app/GoogleBackupTransport","/system/priv-app/GoogleFeedback","/system/priv-app/GoogleLoginService","/system/priv-app/GoogleOneTimeInitializer","/system/priv-app/GooglePartnerSetup","/system/priv-app/GoogleServicesFramework","/system/priv-app/Phonesky","/system/priv-app/PrebuiltGmsCore");

ui_print("Installing files.");
run_program("/sbin/mkdir", "/tmp/face");
Binary files gapps-511-base-20150818-1-signed/optional/gms/0/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk and gapps-511-base-20150904-1-signed/optional/gms/0/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk differ
Binary files gapps-511-base-20150818-1-signed/optional/gms/4/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk and gapps-511-base-20150904-1-signed/optional/gms/4/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk differ
Binary files gapps-511-base-20150818-1-signed/optional/gms/6/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk and gapps-511-base-20150904-1-signed/optional/gms/6/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk differ
Binary files gapps-511-base-20150818-1-signed/optional/gms/8/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk and gapps-511-base-20150904-1-signed/optional/gms/8/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk differ
diff -ru '--exclude=CERT.RSA' '--exclude=CERT.SF' '--exclude=MANIFEST.MF' gapps-511-base-20150818-1-signed/scripts/install-optional.sh gapps-511-base-20150904-1-signed/scripts/install-optional.sh
--- gapps-511-base-20150818-1-signed/scripts/install-optional.sh	2008-02-29 02:33:46.000000000 +0100
+++ gapps-511-base-20150904-1-signed/scripts/install-optional.sh	2008-02-29 02:33:46.000000000 +0100
@@ -28,13 +28,20 @@

TYPE=$(grep ro.build.characteristics /system/build.prop | grep tablet);

-mkdir /system/priv-app/SetupWizard
-if [ ! "$TYPE" == "" ]; then
- echo "Tablet detected."
- cp -f /tmp/setup/tablet/priv-app/SetupWizard/SetupWizard.apk /system/priv-app/SetupWizard/
+if [ -f /sdcard/.removesetupwizard ]; then
+ rm -rf /system/priv-app/SetupWizard
+ sed -i '/Provision/ d' /system/addon.d/70-gapps.sh
+ sed -i '/SetupWizard/ d' /system/addon.d/70-gapps.sh
else
- echo "Phone detected."
- cp -f /tmp/setup/phone/priv-app/SetupWizard/SetupWizard.apk /system/priv-app/SetupWizard/
+ rm -rf /system/app/Provision
+ mkdir /system/priv-app/SetupWizard
+ if [ ! "$TYPE" == "" ]; then
+ echo "Tablet detected."
+ cp -f /tmp/setup/tablet/priv-app/SetupWizard/SetupWizard.apk /system/priv-app/SetupWizard/
+ else
+ echo "Phone detected."
+ cp -f /tmp/setup/phone/priv-app/SetupWizard/SetupWizard.apk /system/priv-app/SetupWizard/
+ fi
fi
rm -rf /tmp/setup
mkdir /tmp/gms
Binary files gapps-511-base-20150818-1-signed/system/priv-app/PrebuiltGmsCore/lib/arm/libAppDataSearch.so and gapps-511-base-20150904-1-signed/system/priv-app/PrebuiltGmsCore/lib/arm/libAppDataSearch.so differ
Binary files gapps-511-base-20150818-1-signed/system/priv-app/PrebuiltGmsCore/lib/arm/libconscrypt_gmscore_jni.so and gapps-511-base-20150904-1-signed/system/priv-app/PrebuiltGmsCore/lib/arm/libconscrypt_gmscore_jni.so differ
Binary files gapps-511-base-20150818-1-signed/system/priv-app/PrebuiltGmsCore/lib/arm/libdirect-audio.so and gapps-511-base-20150904-1-signed/system/priv-app/PrebuiltGmsCore/lib/arm/libdirect-audio.so differ
Binary files gapps-511-base-20150818-1-signed/system/priv-app/PrebuiltGmsCore/lib/arm/libgcastv2_base.so and gapps-511-base-20150904-1-signed/system/priv-app/PrebuiltGmsCore/lib/arm/libgcastv2_base.so differ
Binary files gapps-511-base-20150818-1-signed/system/priv-app/PrebuiltGmsCore/lib/arm/libgcastv2_support.so and gapps-511-base-20150904-1-signed/system/priv-app/PrebuiltGmsCore/lib/arm/libgcastv2_support.so differ
Binary files gapps-511-base-20150818-1-signed/system/priv-app/PrebuiltGmsCore/lib/arm/libgmscore.so and gapps-511-base-20150904-1-signed/system/priv-app/PrebuiltGmsCore/lib/arm/libgmscore.so differ
Binary files gapps-511-base-20150818-1-signed/system/priv-app/PrebuiltGmsCore/lib/arm/libgms-ocrclient.so and gapps-511-base-20150904-1-signed/system/priv-app/PrebuiltGmsCore/lib/arm/libgms-ocrclient.so differ
Binary files gapps-511-base-20150818-1-signed/system/priv-app/PrebuiltGmsCore/lib/arm/libjgcastservice.so and gapps-511-base-20150904-1-signed/system/priv-app/PrebuiltGmsCore/lib/arm/libjgcastservice.so differ
Binary files gapps-511-base-20150818-1-signed/system/priv-app/PrebuiltGmsCore/lib/arm/libleveldbjni.so and gapps-511-base-20150904-1-signed/system/priv-app/PrebuiltGmsCore/lib/arm/libleveldbjni.so differ
Binary files gapps-511-base-20150818-1-signed/system/priv-app/PrebuiltGmsCore/lib/arm/libNearbyApp.so and gapps-511-base-20150904-1-signed/system/priv-app/PrebuiltGmsCore/lib/arm/libNearbyApp.so differ
Binary files gapps-511-base-20150818-1-signed/system/priv-app/PrebuiltGmsCore/lib/arm/libsslwrapper_jni.so and gapps-511-base-20150904-1-signed/system/priv-app/PrebuiltGmsCore/lib/arm/libsslwrapper_jni.so differ
Binary files gapps-511-base-20150818-1-signed/system/priv-app/PrebuiltGmsCore/lib/arm/libwearable-selector.so and gapps-511-base-20150904-1-signed/system/priv-app/PrebuiltGmsCore/lib/arm/libwearable-selector.so differ
Binary files gapps-511-base-20150818-1-signed/system/priv-app/PrebuiltGmsCore/lib/arm/libWhisper.so and gapps-511-base-20150904-1-signed/system/priv-app/PrebuiltGmsCore/lib/arm/libWhisper.so differ