From 68642ca9943369607e8669446324dce00ae61b9f Mon Sep 17 00:00:00 2001 From: Nolen Johnson Date: Wed, 7 Feb 2024 15:32:29 -0500 Subject: [PATCH] lineage: partner_gms: Allow GMS that isn't partner * Other inline packages rely on WITH_GMS for space reservations. Change-Id: Iacc4b01a49f7d44f800faff7bb7072f239e38495 --- config/partner_gms.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/config/partner_gms.mk b/config/partner_gms.mk index 0dbdaf89..e754da30 100644 --- a/config/partner_gms.mk +++ b/config/partner_gms.mk @@ -9,9 +9,9 @@ ifeq ($(WITH_GMS),true) # - gms_minimal.mk - minimal Android TV GMS $(call inherit-product, vendor/partner_gms-tv/products/$(GMS_MAKEFILE)) else - $(call inherit-product, vendor/partner_gms-tv/products/gms.mk) + $(call inherit-product-if-exists, vendor/partner_gms-tv/products/gms.mk) endif - $(call inherit-product, vendor/partner_gms-tv/products/mainline_modules.mk) + $(call inherit-product-if-exists, vendor/partner_gms-tv/products/mainline_modules.mk) endif # Special handling for Android Automotive else ifeq ($(PRODUCT_IS_AUTOMOTIVE),true) @@ -19,7 +19,7 @@ ifeq ($(WITH_GMS),true) ifneq ($(GMS_MAKEFILE),) $(call inherit-product, vendor/partner_gms-car/products/$(GMS_MAKEFILE)) else - $(call inherit-product, vendor/partner_gms-car/products/gms.mk) + $(call inherit-product-if-exists, vendor/partner_gms-car/products/gms.mk) endif endif else @@ -34,7 +34,7 @@ ifeq ($(WITH_GMS),true) ifneq ($(GMS_MAKEFILE),) $(call inherit-product, vendor/partner_gms/products/$(GMS_MAKEFILE)) else - $(call inherit-product, vendor/partner_gms/products/gms.mk) + $(call inherit-product-if-exists, vendor/partner_gms/products/gms.mk) endif endif