gapps: Split Velvet by arch

* This has arch specific libs

arm/Android.mk

@@ -30,4 +30,18 @@ LOCAL_MODULE_SUFFIX := .apk
 LOCAL_PRIVILEGED_MODULE := true
 include $(BUILD_PREBUILT)
 
+ifeq ($(TARGET_IS_GROUPER),)
+include $(CLEAR_VARS)
+LOCAL_MODULE := Velvet
+LOCAL_MODULE_OWNER := gapps
+LOCAL_SRC_FILES := proprietary/priv-app/Velvet/Velvet.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
 endif

arm/arm-vendor.mk

@@ -19,5 +19,10 @@ PRODUCT_COPY_FILES += \
 
 PRODUCT_PACKAGES += \
     PrebuiltGmsCore
+ifeq ($(TARGET_IS_GROUPER),)
+
+PRODUCT_PACKAGES += \
+    Velvet
+endif
 
 $(call inherit-product, vendor/gapps/common/common-vendor.mk)

arm64/Android.mk

@@ -30,4 +30,18 @@ LOCAL_MODULE_SUFFIX := .apk
 LOCAL_PRIVILEGED_MODULE := true
 include $(BUILD_PREBUILT)
 
+ifeq ($(TARGET_IS_GROUPER),)
+include $(CLEAR_VARS)
+LOCAL_MODULE := Velvet
+LOCAL_MODULE_OWNER := gapps
+LOCAL_SRC_FILES := proprietary/priv-app/Velvet/Velvet.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
 endif

arm64/arm64-vendor.mk

@@ -20,5 +20,10 @@ PRODUCT_COPY_FILES += \
 
 PRODUCT_PACKAGES += \
     PrebuiltGmsCore
+ifeq ($(TARGET_IS_GROUPER),)
+
+PRODUCT_PACKAGES += \
+    Velvet
+endif
 
 $(call inherit-product, vendor/gapps/common/common-vendor.mk)

common/Android.mk

@@ -169,17 +169,5 @@ LOCAL_MODULE_SUFFIX := .apk
 LOCAL_PRIVILEGED_MODULE := true
 include $(BUILD_PREBUILT)
 
-include $(CLEAR_VARS)
-LOCAL_MODULE := Velvet
-LOCAL_MODULE_OWNER := gapps
-LOCAL_SRC_FILES := proprietary/priv-app/Velvet/Velvet.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
 endif

common/common-vendor.mk

@@ -37,6 +37,5 @@ PRODUCT_PACKAGES += \
 ifeq ($(TARGET_IS_GROUPER),)
 
 PRODUCT_PACKAGES += \
-    SetupWizard \
+    SetupWizard
-    Velvet
 endif

proprietary-files-arm-nongrouper.txt

@@ -0,0 +1 @@
+-priv-app/Velvet/Velvet.apk;PRESIGNED|bb33e5804f384a2e446b66d2e73b9136b41c9e0c

proprietary-files-arm64-nongrouper.txt

@@ -0,0 +1 @@
+-priv-app/Velvet/Velvet.apk;PRESIGNED|c91bb78c79a335a1786d95800fadb11fe1e1261b

proprietary-files-common-nongrouper.txt

@@ -1,2 +1 @@
 -priv-app/SetupWizard/SetupWizard.apk;PRESIGNED
--priv-app/Velvet/Velvet.apk;PRESIGNED

proprietary-files-x86-nongrouper.txt

@@ -0,0 +1 @@
+-priv-app/Velvet/Velvet.apk;PRESIGNED|d69d0ca0844fe8d794111fa1d836be85a48208c2

setup-makefiles.sh

@@ -70,6 +70,13 @@ write_headers "$TARGET"
 
 write_makefiles "$MY_DIR"/proprietary-files-$TARGET.txt
 
+# Gapps that are too large for grouper
+echo "ifeq (\$(TARGET_IS_GROUPER),)" >> "$PRODUCTMK"
+echo "ifeq (\$(TARGET_IS_GROUPER),)" >> "$ANDROIDMK"
+write_makefiles "$MY_DIR"/proprietary-files-$TARGET-nongrouper.txt
+echo "endif" >> "$PRODUCTMK"
+echo "endif" >> "$ANDROIDMK"
+
 printf '\n%s\n' "\$(call inherit-product, vendor/gapps/common/common-vendor.mk)" >> "$PRODUCTMK"
 
 sed -i 's/TARGET_DEVICE/TARGET_ARCH/g' "$ANDROIDMK"

x86/Android.mk

@@ -30,4 +30,18 @@ LOCAL_MODULE_SUFFIX := .apk
 LOCAL_PRIVILEGED_MODULE := true
 include $(BUILD_PREBUILT)
 
+ifeq ($(TARGET_IS_GROUPER),)
+include $(CLEAR_VARS)
+LOCAL_MODULE := Velvet
+LOCAL_MODULE_OWNER := gapps
+LOCAL_SRC_FILES := proprietary/priv-app/Velvet/Velvet.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
 endif

x86/x86-vendor.mk

@@ -19,5 +19,10 @@ PRODUCT_COPY_FILES += \
 
 PRODUCT_PACKAGES += \
     PrebuiltGmsCore
+ifeq ($(TARGET_IS_GROUPER),)
+
+PRODUCT_PACKAGES += \
+    Velvet
+endif
 
 $(call inherit-product, vendor/gapps/common/common-vendor.mk)