diff --git a/configure b/configure
index d175ed32b52..be89b22291a 100755
--- a/configure
+++ b/configure
@@ -3216,6 +3216,9 @@ if [ "$XPLATFORM_ANDROID" = "yes" ]; then
     if [ "$CFG_DBUS" = "auto" ]; then
         CFG_DBUS="no"
     fi
+    if [ "$CFG_EGLFS" = "auto" ]; then
+        CFG_EGLFS="no"
+    fi
     if [ -z "$CFG_DEFAULT_ANDROID_NDK_HOST" ]; then
         case $PLATFORM in
         linux-*)
diff --git a/src/plugins/platforms/platforms.pro b/src/plugins/platforms/platforms.pro
index 43bb04e3184..9b4b6c518a9 100644
--- a/src/plugins/platforms/platforms.pro
+++ b/src/plugins/platforms/platforms.pro
@@ -2,9 +2,9 @@ TEMPLATE = subdirs
 
 android:!android-no-sdk: SUBDIRS += android
 
-SUBDIRS += minimal
+!android: SUBDIRS += minimal
 
-!win32|contains(QT_CONFIG, freetype):SUBDIRS += offscreen
+!android:if(!win32|contains(QT_CONFIG, freetype)): SUBDIRS += offscreen
 
 contains(QT_CONFIG, xcb) {
     SUBDIRS += xcb
diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro
index 03b7dc266bb..5e180904c75 100644
--- a/src/plugins/plugins.pro
+++ b/src/plugins/plugins.pro
@@ -6,7 +6,7 @@ qtHaveModule(network):!contains(QT_DISABLED_FEATURES, bearermanagement): SUBDIRS
 qtHaveModule(gui) {
     SUBDIRS *= platforms platforminputcontexts platformthemes
     !contains(QT_DISABLED_FEATURES, imageformatplugin): SUBDIRS *= imageformats
-    !contains(QT_DISABLED_FEATURES, library): SUBDIRS *= generic
+    !android:!contains(QT_DISABLED_FEATURES, library): SUBDIRS *= generic
 }
 qtHaveModule(widgets): SUBDIRS *= styles