diff --git a/config/partner_gms.mk b/config/partner_gms.mk
index f5b7c493..11b308db 100644
--- a/config/partner_gms.mk
+++ b/config/partner_gms.mk
@@ -3,6 +3,9 @@ ifeq ($(WITH_GMS),true)
     ifeq ($(WITH_GMS_TV),true)
         $(call inherit-product, vendor/partner_gms-tv/products/gms.mk)
         $(call inherit-product, vendor/partner_gms-tv/products/mainline_modules.mk)
+    # Special handling for Android Automotive
+    else ifeq ($(WITH_GMS_CAR),true)
+        $(call inherit-product, vendor/partner_gms-car/products/gms.mk)
     else
         # Specify the GMS makefile you want to use, for example:
         #   - fi.mk             - Project Fi