From c93bdd63c87d1b95f8c18f5d0ee4cba44268b91e Mon Sep 17 00:00:00 2001 From: Bruno Martins Date: Thu, 9 Jun 2022 21:03:18 +0100 Subject: [PATCH] partner_gms: Stop relying on exported vars for ATV and Automotive targets Flag PRODUCT_IS_ATV must be set for all ATV targets, so Automotive targets can follow and adopt PRODUCT_IS_AUTO as well. No need to export WITH_GMS_TV or WITH_GMS_CAR anymore. Change-Id: I7f35e7fa731f7cee239aff03c99b83975abbb56e --- config/partner_gms.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/partner_gms.mk b/config/partner_gms.mk index 88d69f6e..c7dc7957 100644 --- a/config/partner_gms.mk +++ b/config/partner_gms.mk @@ -1,6 +1,6 @@ ifeq ($(WITH_GMS),true) # Special handling for Android TV - ifeq ($(WITH_GMS_TV),true) + ifeq ($(PRODUCT_IS_ATV),true) ifneq ($(GMS_MAKEFILE),) # Specify the GMS makefile you want to use, for example: # - gms.mk - default Android TV GMS @@ -12,7 +12,7 @@ ifeq ($(WITH_GMS),true) endif $(call inherit-product, vendor/partner_gms-tv/products/mainline_modules.mk) # Special handling for Android Automotive - else ifeq ($(WITH_GMS_CAR),true) + else ifeq ($(PRODUCT_IS_AUTO),true) ifneq ($(GMS_MAKEFILE),) $(call inherit-product, vendor/partner_gms-car/products/$(GMS_MAKEFILE)) else