From 7a830b3d3ea4779bf47a90f718e09c48977381b3 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Sun, 24 May 2020 18:29:04 +0200
Subject: [PATCH] gmsexpress-based gapps-go. arm64_ab fits in 2GB. arm_a
 doesn't fit on Redmi Go though

---
 gapps-go.mk           | 23 ++++++++++++++++++++---
 overrides/Android.mk  | 34 ++++++++++++++++++++++++++++++++++
 overrides/nothing.txt |  0
 3 files changed, 54 insertions(+), 3 deletions(-)
 create mode 100644 overrides/Android.mk
 create mode 100644 overrides/nothing.txt

diff --git a/gapps-go.mk b/gapps-go.mk
index 3d30032..ba96a55 100644
--- a/gapps-go.mk
+++ b/gapps-go.mk
@@ -1,3 +1,20 @@
-DONT_DEXPREOPT_PREBUILTS := true
-$(call inherit-product, build/make/target/product/go_defaults.mk)
-$(call inherit-product, vendor/gapps-go/gapps-go.mk) 
+BUILD_GMS := yes
+#include not inherit, because we must edit some values
+include vendor/google/products/gms_go.mk
+
+FILTER_OUT = $(foreach v,$(2),$(if $(findstring $(1),$(v)),,$(v)))
+
+#gms_go.mk has a broken copy of google_go.xml => google.xml
+#But there already is a google.xml => google.xml
+#Only difference between those is maps go and youtube go applinks, so good enough
+PRODUCT_COPY_FILES := $(call FILTER_OUT,google_go.xml:, $(PRODUCT_COPY_FILES))
+
+#We need to use this way because it overrides sync adapters
+PRODUCT_PACKAGES := $(call FILTER_OUT,CalendarGoogle, $(PRODUCT_PACKAGES))
+PRODUCT_PACKAGES := $(call FILTER_OUT,GoogleContacts, $(PRODUCT_PACKAGES))
+
+PRODUCT_SHIPPING_API_LEVEL :=
+
+PRODUCT_PACKAGES += \
+	phh-gapps-go-overrides \
+
diff --git a/overrides/Android.mk b/overrides/Android.mk
new file mode 100644
index 0000000..efb203f
--- /dev/null
+++ b/overrides/Android.mk
@@ -0,0 +1,34 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := phh-gapps-go-overrides
+PACKAGES.phh-gapps-go-overrides.OVERRIDES := \
+	Wellbeing \
+	GMailGo \
+	YouTubeGo \
+	DuoGo \
+	Traceur \
+
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := ETC
+LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)
+LOCAL_SRC_FILES := nothing.txt
+LOCAL_UNINSTALLABLE_MODULE := true
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := phh-gapps-overrides
+PACKAGES.phh-gapps-go-overrides.OVERRIDES := \
+	Drive \
+	YTMusic \
+	Videos \
+	Duo \
+	Traceur \
+	Weelbeing \
+
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := ETC
+LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)
+LOCAL_SRC_FILES := nothing.txt
+LOCAL_UNINSTALLABLE_MODULE := true
+include $(BUILD_PREBUILT)
diff --git a/overrides/nothing.txt b/overrides/nothing.txt
new file mode 100644
index 0000000..e69de29