From 5c914855be93ca0aa5996d4843034c16d59c37a5 Mon Sep 17 00:00:00 2001
From: Nolen Johnson <johnsonnolen@gmail.com>
Date: Sat, 22 Jun 2019 22:25:40 +0000
Subject: [PATCH] extra: Move GApps definitions to partner_gms

---
 gapps.mk   | 128 -----------------------------------------------------
 product.mk |  10 ++++-
 2 files changed, 8 insertions(+), 130 deletions(-)
 delete mode 100644 gapps.mk

diff --git a/gapps.mk b/gapps.mk
deleted file mode 100644
index 1e06e98..0000000
--- a/gapps.mk
+++ /dev/null
@@ -1,128 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-STOCK_GAPPS_DEVICES += \
-    %berkeley \
-    %ether \
-    %nash \
-    %klte
-
-MICRO_GAPPS_DEVICES += \
-    %shieldtablet
-
-NANO_GAPPS_DEVICES += \
-    %bacon \
-    %hlte \
-    %hltetmo \
-    %molly
-
-PICO_GAPPS_DEVICES += \
-    %jfltevzw \
-    %jfltexx \
-    %yellowstone
-
-MOST_GAPPS_DEVICES += \
-    %shamu
-
-FLASH_GAPPS_DEVICES += \
-    %flo
-
-EXCLUDE_GOOGLE_SYSUI_DEVICES += \
-    %hammerhead \
-    %foster \
-    %fugu \
-    %tv_molly
-
-GAPPS_DEVICES += \
-    $(STOCK_GAPPS_DEVICES) \
-    $(MOST_GAPPS_DEVICES) \
-    $(MICRO_GAPPS_DEVICES) \
-    $(NANO_GAPPS_DEVICES) \
-    $(PICO_GAPPS_DEVICES) \
-    $(PIXEL_CODENAMES)
-
-ifneq ($(filter $(PIXEL_CODENAMES),$(TARGET_PRODUCT)),)
-GAPPS_VARIANT := stock
-GAPPS_FORCE_PACKAGE_OVERRIDES := true
-GAPPS_FORCE_PIXEL_LAUNCHER := true
-endif # Pixel GApps
-
-ifneq ($(filter $(STOCK_GAPPS_DEVICES),$(TARGET_PRODUCT)),)
-GAPPS_VARIANT := stock
-GAPPS_FORCE_PACKAGE_OVERRIDES := true
-GAPPS_FORCE_PIXEL_LAUNCHER := true
-GAPPS_EXCLUDED_PACKAGES += \
-    GoogleCamera \
-    Turbo \
-    MarkupGoogle
-endif # Stock GApps
-
-
-ifneq ($(filter $(MICRO_GAPPS_DEVICES),$(TARGET_PRODUCT)),)
-GAPPS_VARIANT := micro
-GAPPS_FORCE_PACKAGE_OVERRIDES := true
-GAPPS_FORCE_PIXEL_LAUNCHER := true
-GAPPS_EXCLUDED_PACKAGES += \
-    GoogleCamera \
-    Turbo \
-    MarkupGoogle
-endif # Stock GApps
-
-ifneq ($(filter $(MOST_GAPPS_DEVICES),$(TARGET_PRODUCT)),)
-GAPPS_VARIANT := stock
-GAPPS_FORCE_PACKAGE_OVERRIDES := true
-GAPPS_FORCE_PIXEL_LAUNCHER := true
-GAPPS_EXCLUDED_PACKAGES := GoogleCamera
-GAPPS_EXCLUDED_PACKAGES += \
-    Maps \
-    Hangouts \
-    EditorSheets \
-    YouTube \
-    PlusOne \
-    EditorDocs \
-    Drive \
-    FitnessPrebuilt \
-    PrebuiltKeep \
-    Books \
-    PlayGames \
-    Videos \
-    EditorSlides \
-    Turbo \
-    MarkupGoogle
-endif # Most GApps
-
-ifneq ($(filter $(NANO_GAPPS_DEVICES),$(TARGET_PRODUCT)),)
-GAPPS_VARIANT := nano
-GAPPS_FORCE_PACKAGE_OVERRIDES := true
-GAPPS_FORCE_PIXEL_LAUNCHER := true
-GAPPS_EXCLUDED_PACKAGES += \
-    MarkupGoogle \
-    Turbo
-endif # Nano GApps
-
-ifneq ($(filter $(PICO_GAPPS_DEVICES),$(TARGET_PRODUCT)),)
-GAPPS_VARIANT := pico
-GAPPS_FORCE_PACKAGE_OVERRIDES := true
-GAPPS_FORCE_PIXEL_LAUNCHER := true
-GAPPS_EXCLUDED_PACKAGES += \
-    CalSync \
-    DialerFramework \
-    BatteryUsage \
-    FaceDetect \
-    FaceUnlock \
-    MarkupGoogle \
-    Speech \
-    Wellbeing \
-    PixelLauncherIcons \
-    GoogleTTS \
-    Wallpapers \
-    Turbo \
-    GoogleCalendarSyncAdapter \
-    GoogleContactsSyncAdapter \
-    CompanionDeviceManager \
-    GoogleFeedback \
-    MarkupGoogle
-endif # Pico GApps
-
-ifneq ($(filter $(GAPPS_DEVICES),$(TARGET_PRODUCT)),)
-WITH_GMS := true
-endif # GApps Inclusion
diff --git a/product.mk b/product.mk
index 0590bf5..291c895 100644
--- a/product.mk
+++ b/product.mk
@@ -49,11 +49,17 @@ PRODUCT_PACKAGES += \
     MotCamera2
 endif
 
-ifneq ($(filter %fugu,$(TARGET_PRODUCT)),)
+EXCLUDE_GOOGLE_SERVICES_DEVICES += \
+    %hammerhead \
+    %jfltexx \
+    %foster \
+    %fugu \
+    %tv_molly
+
+ifneq ($(filter $(EXCLUDE_GOOGLE_SERVICES_DEVICES),$(TARGET_PRODUCT)),)
 DISABLE_GAPPS := true
 endif
 
 ifneq ($(DISABLE_GAPPS),true)
 -include vendor/google_pixel/product.mk
--include vendor/extra/gapps.mk
 endif # Disable GApps