build/envsetup.sh

@@ -50,7 +50,7 @@ function breakfast()
         else
             # This is probably just the Lineage model name
             if [ -z "$variant" ]; then
-                variant="user"
+                variant="userdebug"
             fi
 
             lunch lineage_$target-$aosp_target_release-$variant

config/common.mk

@@ -1,7 +1,6 @@
 # Allow vendor/extra to override any property by setting it first
 $(call inherit-product-if-exists, vendor/extra/product.mk)
 $(call inherit-product-if-exists, vendor/certification/config.mk)
-$(call inherit-product, vendor/lineage/config/scoop.mk)
 
 PRODUCT_BRAND ?= LineageOS
 
@@ -241,11 +240,9 @@ PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
 endif
 
 # SetupWizard
-ifneq ($(WITH_GMS),true)
 PRODUCT_PRODUCT_PROPERTIES += \
     setupwizard.theme=glif_v4 \
     setupwizard.feature.day_night_mode_enabled=true
-endif
 
 PRODUCT_ENFORCE_RRO_EXCLUDED_OVERLAYS += vendor/lineage/overlay/no-rro
 PRODUCT_PACKAGE_OVERLAYS += \
@@ -272,8 +269,7 @@ PRODUCT_EXTRA_RECOVERY_KEYS += \
 
 include vendor/lineage/config/version.mk
 
-# -include vendor/lineage-priv/keys/keys.mk
+-include vendor/lineage-priv/keys/keys.mk
+
 -include $(WORKSPACE)/build_env/image-auto-bits.mk
 -include vendor/lineage/config/partner_gms.mk
-
-#$(call inherit-product, vendor/lineage/config/scoop.mk)

config/common_mobile.mk

@@ -9,11 +9,9 @@ include vendor/lineage/config/aosp_audio.mk
 include vendor/lineage/config/lineage_audio.mk
 
 # Default notification/alarm sounds
-ifneq ($(WITH_GMS),true)
 PRODUCT_PRODUCT_PROPERTIES += \
     ro.config.notification_sound=Argon.ogg \
     ro.config.alarm_alert=Hassium.ogg
-endif
 
 # Apps
 PRODUCT_PACKAGES += \

config/scoop.mk

@@ -1,4 +0,0 @@
-#BUILD_GMS_OVERLAYS_AND_PROPS := true
-$(call inherit-product, vendor/gms/products/gms.mk)
-
--include vendor/lineage-priv/keys/keys.mk

config/telephony.mk

@@ -17,10 +17,8 @@ PRODUCT_PACKAGES += \
     Stk
 
 # Default ringtone
-ifneq ($(WITH_GMS),true)
 PRODUCT_PRODUCT_PROPERTIES += \
     ro.config.ringtone=Orion.ogg
-endif
 
 # Tethering - allow without requiring a provisioning app
 # (for devices that check this)