From 4f291af9a3fa7fd465d5d7b338f0db72e4caedeb Mon Sep 17 00:00:00 2001 From: Nolen Johnson Date: Thu, 10 Feb 2022 11:24:26 -0500 Subject: [PATCH] config: partner_gms: Make mainline modules entirely opt-in * Except for Android TV, which requires them to boot. * Most people on mobile and car builds won't want mainline modules, as they may conflict with LineageOS features. Change-Id: I9b4db3e6a109b834963a4ddacacc855dc55c258c --- config/partner_gms.mk | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/config/partner_gms.mk b/config/partner_gms.mk index 254ba83d..f5b7c493 100644 --- a/config/partner_gms.mk +++ b/config/partner_gms.mk @@ -2,7 +2,7 @@ ifeq ($(WITH_GMS),true) # Special handling for Android TV ifeq ($(WITH_GMS_TV),true) $(call inherit-product, vendor/partner_gms-tv/products/gms.mk) - $(call inherit-product-if-exists, vendor/partner_gms-tv/products/mainline_modules.mk) + $(call inherit-product, vendor/partner_gms-tv/products/mainline_modules.mk) else # Specify the GMS makefile you want to use, for example: # - fi.mk - Project Fi @@ -22,9 +22,6 @@ ifeq ($(WITH_GMS),true) # - mainline_modules_low_ram.mk - low ram devices ifneq ($(MAINLINE_MODULES_MAKEFILE),) $(call inherit-product, vendor/partner_modules/build/$(MAINLINE_MODULES_MAKEFILE)) - else - # Do not fail if not existing, as it is valid to use GMS without mainline modules - $(call inherit-product-if-exists, vendor/partner_modules/build/mainline_modules.mk) endif endif endif