From b346fa715576839f2799fda42668ab2be5356a30 Mon Sep 17 00:00:00 2001
From: Tao Huang <huangtao@rock-chips.com>
Date: Fri, 8 Apr 2022 22:11:28 +0800
Subject: [PATCH] android: default disable ANDROID_STRUCT_PADDING if NO_GKI

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Ie80bff8b17fee0c574a69119e79a196754c044e8
---
 drivers/android/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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