diff --git a/drivers/android/Kconfig b/drivers/android/Kconfig
index c9636c3c6dbd..38485f83c7d4 100644
--- a/drivers/android/Kconfig
+++ b/drivers/android/Kconfig
@@ -76,7 +76,7 @@ config ANDROID_VENDOR_HOOKS
 
 config ANDROID_STRUCT_PADDING
 	bool "Android Struct Padding"
-	default y
+	default y if !NO_GKI
 	help
 	  This option enables the padding that the Android GKI kernel adds
 	  to many different kernel structures to support an in-kernel stable ABI