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
This commit is contained in:
Bruno Martins 2022-06-09 21:03:18 +01:00
parent 265fdadd56
commit c93bdd63c8

View File

@ -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