Revert "gapps: Thoroughly remove SuW"

This reverts commit 5caba031a6.
2018-02-15 22:14:04 -08:00
parent 16928d9abb
commit 17c1984627
5 changed files with 17 additions and 5 deletions
--- a/common/Android.mk
+++ b/common/Android.mk
@@ -147,6 +147,18 @@ 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
--- a/common/common-vendor.mk
+++ b/common/common-vendor.mk
@@ -31,4 +31,5 @@ PRODUCT_PACKAGES += \
    GooglePartnerSetup \
    GoogleServicesFramework \
    Phonesky \
+    SetupWizard \
    com.google.android.maps
--- a/common/proprietary/priv-app/SetupWizard/SetupWizard.apk
+++ b/common/proprietary/priv-app/SetupWizard/SetupWizard.apk