From 200e7cb6b044d0d6e53bdaba9d1bdebe76892a5f Mon Sep 17 00:00:00 2001
From: Ramji Jiyani <ramjiyani@google.com>
Date: Wed, 26 Oct 2022 01:01:29 +0000
Subject: [PATCH] ANDROID: GKI: x86_64: zram & zsmalloc as modules

Enable zram and zsmalloc as modules to be in sync
with the aarch64 builds.

Bug: 232431151
Test: TH
Signed-off-by: Ramji Jiyani <ramjiyani@google.com>
Change-Id: I55053eeb6beda342689c854f95f4307871a3729b
(cherry picked from commit 44e9b82e013edee43f02f68e0b8a011135d290db)
---
 BUILD.bazel                    | 16 ++++++++++++++++
 arch/x86/configs/gki_defconfig |  1 +
 2 files changed, 17 insertions(+)

diff --git a/BUILD.bazel b/BUILD.bazel
index e08d4a846b68..10b8caaeca05 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -40,6 +40,22 @@ define_common_kernels(target_configs = {
             "mm/zsmalloc.ko",
         ],
     },
+    # Sync with build.config.gki.x86_64
+    "kernel_x86_64": {
+        "kmi_symbol_list_strict_mode": False,
+        "module_implicit_outs": [
+            "drivers/block/zram/zram.ko",
+            "mm/zsmalloc.ko",
+        ],
+    },
+    # Sync with build.config.gki-debug.x86_64
+    "kernel_x86_64_debug": {
+        "kmi_symbol_list_strict_mode": False,
+        "module_implicit_outs": [
+            "drivers/block/zram/zram.ko",
+            "mm/zsmalloc.ko",
+        ],
+    },
 })
 
 # Sync with build.config.db845c
diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig
index 7ecc97dfb518..f344de3ce22d 100644
--- a/arch/x86/configs/gki_defconfig
+++ b/arch/x86/configs/gki_defconfig
@@ -271,6 +271,7 @@ CONFIG_FW_LOADER_USER_HELPER=y
 # CONFIG_FW_CACHE is not set
 CONFIG_GNSS=y
 CONFIG_OF=y
+CONFIG_ZRAM=m
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_LOOP_MIN_COUNT=16
 CONFIG_BLK_DEV_RAM=y