Add WITH_MICROG setting

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).

README.md

@@ -54,13 +54,12 @@ the list of devices for each specific branch (see [the examples](#examples)).
 
 ### GMS / microG
 
-To include microG (or possibly the actual Google Mobile Services) in your build,
-LineageOS expects certain Makefiles in `vendor/partner_gms` and variable
-`WITH_GMS` set to `true`.
+To include microG's components in your build, you must provide the components
+in `vendor/partner_gms` and set variable `WITH_MICROG` to `true`.
 
 [This][android_vendor_partner_gms] repo contains the common packages included for
-official lineageos4microg builds. To include it in your build, create an XML
-(the name is irrelevant, as long as it ends with `.xml`) in the
+official lineageos4microg builds. To include it in your build, create a `microg.xml`
+file (the name is irrelevant as long as it ends with `.xml`) in the
 `/home/user/manifests` folder with this content:
 
 ```xml
@@ -70,6 +69,9 @@ official lineageos4microg builds. To include it in your build, create an XML
 </manifest>
 ```
 
+To include the actual Google Mobile Services in your build instead, provide
+those components in `vendor/partner_gms` and set variable `WITH_GMS` to `true`.
+
 ### Additional custom apps
 
 If you wish to add other apps to your ROM, you can include a repository with
@@ -231,7 +233,7 @@ docker run \
     -e "DEVICE_LIST=bacon" \
     -e "SIGN_BUILDS=true" \
     -e "SIGNATURE_SPOOFING=restricted" \
-    -e "WITH_GMS=true" \
+    -e "WITH_MICROG=true" \
     -v "/home/user/lineage:/srv/src" \
     -v "/home/user/zips:/srv/zips" \
     -v "/home/user/logs:/srv/logs" \
@@ -258,7 +260,7 @@ docker run \
     -e "DEVICE_LIST_LINEAGE_18_1=river,lake" \
     -e "SIGN_BUILDS=true" \
     -e "SIGNATURE_SPOOFING=restricted" \
-    -e "WITH_GMS=true" \
+    -e "WITH_MICROG=true" \
     -e "OTA_URL=https://api.myserver.com/" \
     -v "/home/user/lineage:/srv/src" \
     -v "/home/user/zips:/srv/zips" \
@@ -319,7 +321,7 @@ docker run \
     -e "DEVICE_LIST=a6000" \
     -e "SIGN_BUILDS=true" \
     -e "SIGNATURE_SPOOFING=restricted" \
-    -e "WITH_GMS=true" \
+    -e "WITH_MICROG=true" \
     -e "INCLUDE_PROPRIETARY=false" \
     -v "/home/user/lineage:/srv/src" \
     -v "/home/user/zips:/srv/zips" \

src/build.sh

@@ -207,6 +207,11 @@ 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
+    if [ "$WITH_MICROG" = true ]; then
+      echo '$(call inherit-product, vendor/partner_gms/products/gms.mk)' > "vendor/$vendor/config/partner_gms.mk"
+    fi
+
     # 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