diff --git a/product.mk b/product.mk
index dc1f5f8..c2ad1f5 100644
--- a/product.mk
+++ b/product.mk
@@ -16,6 +16,20 @@ ifneq ($(filter %river,$(TARGET_PRODUCT)),)
 -include vendor/extra/oem-cameras/MotCamera2-denali/MotCamera2-denali.mk
 endif
 
+## GMS
+ifeq ($(filter %shieldtablet,$(TARGET_PRODUCT)),)
+WITH_GMS := true
+endif
+ifneq ($(filter %gsi_car_arm64 %gsi_car_x86_64 %tv_arm64 %tv_x86_64,$(TARGET_PRODUCT)),)
+WITH_GMS_CAR := true
+endif
+ifneq ($(filter %deadpool %dopinder %wade %radxa0 %m5 %odroidc4 %gsi_tv_arm %gsi_tv_arm64 %tv_arm %tv_arm64,$(TARGET_PRODUCT)),)
+WITH_GMS_TV := true
+endif
+ifneq ($(filter %bonito %sargo %TP1803 %taimen %walleye %pro1 %lake %beckham %payton %evert %chef %DRG %river %ocean %sailfish %marlin %troika %kane %bacon %flox,$(TARGET_PRODUCT)),)
+WITH_GMS_MINIMAL := true
+endif
+
 ## ih8sn
 PRODUCT_PACKAGES += ih8sn