diff --git a/build/meta/com/google/android/update-binary b/build/meta/com/google/android/update-binary index 6bc131b..9afe7a8 100644 --- a/build/meta/com/google/android/update-binary +++ b/build/meta/com/google/android/update-binary @@ -63,8 +63,8 @@ if [ -d $SYSTEM/lib64 ]; then LD_PATH=$SYSTEM/lib64 fi -LOWMEM=1572864 -MEM=`cat /proc/meminfo | head -1 | sed 's/[^0-9]*//g'` +#LOWMEM=1572864 +#MEM=`cat /proc/meminfo | head -1 | sed 's/[^0-9]*//g'` ui_print "Extracting files" cd /tmp @@ -73,7 +73,7 @@ exec_util "rm -rf META-INF" cd system #if [ "$MEM" -lt "$LOWMEM" ]; then # ui_print "Low RAM device detected, removing Google SuW" - exec_util "rm -rf priv-app/SetupWizard" +# exec_util "rm -rf priv-app/SetupWizard" #fi ui_print "Generating addon.d file" cat addon.d/addond_head > addon.d/30-gapps.sh diff --git a/common/Android.mk b/common/Android.mk index c125d50..0ccb23c 100644 --- a/common/Android.mk +++ b/common/Android.mk @@ -147,18 +147,6 @@ LOCAL_MODULE_SUFFIX := .apk LOCAL_PRIVILEGED_MODULE := true include $(BUILD_PREBUILT) -include $(CLEAR_VARS) -LOCAL_MODULE := SetupWizard -LOCAL_MODULE_OWNER := gapps -LOCAL_SRC_FILES := proprietary/priv-app/SetupWizard/SetupWizard.apk -LOCAL_CERTIFICATE := PRESIGNED -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := APPS -LOCAL_DEX_PREOPT := false -LOCAL_MODULE_SUFFIX := .apk -LOCAL_PRIVILEGED_MODULE := true -include $(BUILD_PREBUILT) - include $(CLEAR_VARS) LOCAL_MODULE := com.google.android.maps LOCAL_MODULE_OWNER := gapps diff --git a/common/common-vendor.mk b/common/common-vendor.mk index 30df4c5..7d6e3d2 100644 --- a/common/common-vendor.mk +++ b/common/common-vendor.mk @@ -31,5 +31,4 @@ PRODUCT_PACKAGES += \ GooglePartnerSetup \ GoogleServicesFramework \ Phonesky \ - SetupWizard \ com.google.android.maps diff --git a/common/proprietary/priv-app/SetupWizard/SetupWizard.apk b/common/proprietary/priv-app/SetupWizard/SetupWizard.apk deleted file mode 100644 index 4782ffa..0000000 Binary files a/common/proprietary/priv-app/SetupWizard/SetupWizard.apk and /dev/null differ diff --git a/proprietary-files-common.txt b/proprietary-files-common.txt index 7a0120c..1f1288f 100644 --- a/proprietary-files-common.txt +++ b/proprietary-files-common.txt @@ -10,7 +10,8 @@ -priv-app/GooglePartnerSetup/GooglePartnerSetup.apk;PRESIGNED -priv-app/GoogleServicesFramework/GoogleServicesFramework.apk;PRESIGNED -priv-app/Phonesky/Phonesky.apk;PRESIGNED --priv-app/SetupWizard/SetupWizard.apk;PRESIGNED +# Temp disabled as all 8.1 versions crash +#-priv-app/SetupWizard/SetupWizard.apk;PRESIGNED -framework/com.google.android.maps.jar;PRESIGNED