Commonize SetupWizard

Change-Id: I546108dc58f4b4b89b9551bd4e94f8473a90269b Signed-off-by: Paul Keith <javelinanddart@bestas.gr>
2017-04-06 14:22:13 -05:00 · 2017-04-06 14:22:13 -05:00 · 7c47b86bad
commit 7c47b86bad
parent 83e0c848e9
10 changed files with 17 additions and 30 deletions
--- a/arm/Android.mk
+++ b/arm/Android.mk
@ -16,7 +16,7 @@

 LOCAL_PATH := $(call my-dir)

-ifneq ($(TARGET_DEVICE),)
+ifeq ($(TARGET_DEVICE),)

 include $(CLEAR_VARS)
 LOCAL_MODULE := PrebuiltGmsCore
@ -30,16 +30,4 @@ 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/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)
-
 endif
--- a/arm/arm-vendor.mk
+++ b/arm/arm-vendor.mk
@ -18,7 +18,6 @@ PRODUCT_COPY_FILES += \
    vendor/gapps/arm/proprietary/lib/libjni_latinimegoogle.so:system/lib/libjni_latinimegoogle.so

 PRODUCT_PACKAGES += \
-    PrebuiltGmsCore \
-    SetupWizard
+    PrebuiltGmsCore

 $(call inherit-product, vendor/gapps/common/common-vendor.mk)
--- a/arm/proprietary/priv-app/SetupWizard/SetupWizard.apk
+++ b/arm/proprietary/priv-app/SetupWizard/SetupWizard.apk
--- a/arm64/Android.mk
+++ b/arm64/Android.mk
@ -30,16 +30,4 @@ 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/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)
-
 endif
--- a/arm64/arm64-vendor.mk
+++ b/arm64/arm64-vendor.mk
@ -19,7 +19,6 @@ PRODUCT_COPY_FILES += \
    vendor/gapps/arm64/proprietary/lib64/libjni_latinimegoogle.so:system/lib64/libjni_latinimegoogle.so

 PRODUCT_PACKAGES += \
-    PrebuiltGmsCore \
-    SetupWizard
+    PrebuiltGmsCore

 $(call inherit-product, vendor/gapps/common/common-vendor.mk)
--- a/common-proprietary-files.txt
+++ b/common-proprietary-files.txt
@ -10,6 +10,7 @@
 -priv-app/GooglePartnerSetup/GooglePartnerSetup.apk:PRESIGNED
 -priv-app/GoogleServicesFramework/GoogleServicesFramework.apk:PRESIGNED
 -priv-app/Phonesky/Phonesky.apk:PRESIGNED
+-priv-app/SetupWizard/SetupWizard.apk:PRESIGNED

 -framework/com.google.android.maps.jar:PRESIGNED
 -framework/com.google.android.media.effects.jar:PRESIGNED
--- a/common/Android.mk
+++ b/common/Android.mk
@ -148,6 +148,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/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
@ -35,6 +35,7 @@ PRODUCT_PACKAGES += \
    GooglePartnerSetup \
    GoogleServicesFramework \
    Phonesky \
+    SetupWizard \
    com.google.android.maps \
    com.google.android.media.effects \
    com.google.widevine.software.drm
--- a/common/proprietary/priv-app/SetupWizard/SetupWizard.apk
+++ b/common/proprietary/priv-app/SetupWizard/SetupWizard.apk
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@ -1,2 +1 @@
 -priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk:PRESIGNED
-priv-app/SetupWizard/SetupWizard.apk:PRESIGNED