Add 'WITH_MICROG' setting

Introduce 'WITH_MICROG' to replace use of 'WITH_GMS'. Fixes lineageos4microg#358.

Dockerfile

@@ -93,6 +93,9 @@ ENV ZIP_SUBDIR true
 # Write the verbose logs to $LOGS_DIR/$codename instead of $LOGS_DIR/
 ENV LOGS_SUBDIR true
 
+# Include microG's components in the ROM
+ENV WITH_MICROG false
+
 # Apply the MicroG's signature spoofing patch
 # Valid values are "no", "yes" (for the original MicroG's patch) and
 # "restricted" (to grant the permission only to the system privileged apps).

src/build.sh

@@ -207,6 +207,10 @@ for branch in ${BRANCH_NAME//,/ }; do
     los_ver_minor=$(sed -n -e 's/^\s*PRODUCT_VERSION_MINOR = //p' "$makefile_containing_version")
     los_ver="$los_ver_major.$los_ver_minor"
 
+    # If needed, include microG's components
+    #sed -i 's/$(WITH_GMS)/$(WITH_GMS)$(WITH_MICROG)/g' "vendor/$vendor/config/partner_gms.mk"
+    sed -i 's/ifeq ($(WITH_GMS),true)/ifneq ($(filter true,$(WITH_GMS) $(WITH_MICROG)),)/g' "vendor/$vendor/config/partner_gms.mk"
+
     # If needed, apply the microG's signature spoofing patch
     if [ "$SIGNATURE_SPOOFING" = "yes" ] || [ "$SIGNATURE_SPOOFING" = "restricted" ]; then
       # Determine which patch should be applied to the current Android source tree