From 05b03863825e4f26ef16f7eae4610d9f420626d8 Mon Sep 17 00:00:00 2001 From: Pierre-Hugues Husson Date: Sun, 24 May 2020 22:07:19 +0200 Subject: [PATCH] <2GB arm64_ab gapps system --- gapps-go.mk | 6 +++--- gapps.mk | 9 +++++++-- overrides/Android.mk | 2 +- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/gapps-go.mk b/gapps-go.mk index ba96a55..c43a33c 100644 --- a/gapps-go.mk +++ b/gapps-go.mk @@ -10,11 +10,11 @@ FILTER_OUT = $(foreach v,$(2),$(if $(findstring $(1),$(v)),,$(v))) 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_PACKAGES := $(filter-out CalendarGoogle, $(PRODUCT_PACKAGES)) +PRODUCT_PACKAGES := $(filter-out GoogleContacts, $(PRODUCT_PACKAGES)) PRODUCT_SHIPPING_API_LEVEL := PRODUCT_PACKAGES += \ phh-gapps-go-overrides \ - + GoogleContactsSyncAdapter \ diff --git a/gapps.mk b/gapps.mk index 12c704e..2890a5a 100644 --- a/gapps.mk +++ b/gapps.mk @@ -1,11 +1,16 @@ BUILD_GMS := yes ifneq ($(wildcard vendor/google),) --include vendor/google/products/gms_eea_type1.mk +-include vendor/google/products/gms.mk PRODUCT_SHIPPING_API_LEVEL := + +PRODUCT_PACKAGES := $(filter-out CalendarGoogle, $(PRODUCT_PACKAGES)) +PRODUCT_PACKAGES := $(filter-out GoogleContacts, $(PRODUCT_PACKAGES)) + PRODUCT_PACKAGES += \ phh-gapps-overrides \ + Chrome \ + GoogleContactsSyncAdapter \ -FILTER_OUT = $(foreach v,$(2),$(if $(findstring $(1),$(v)),,$(v))) endif ifneq ($(wildcard vendor/opengapps),) diff --git a/overrides/Android.mk b/overrides/Android.mk index e9116d5..10ce988 100644 --- a/overrides/Android.mk +++ b/overrides/Android.mk @@ -29,7 +29,7 @@ PACKAGES.$(LOCAL_MODULE).OVERRIDES := \ Photos \ Maps \ Gmail2 \ - GoogleContacts \ + Velvet \ GmsSampleIntegration \ GmsSampleIntegrationGo \ GmsSampleIntegrationGo2GB \