From f080086bd2403aba4d7fd2f1432780e24085483c Mon Sep 17 00:00:00 2001
From: Ravi Jain <raviajain@google.com>
Date: Mon, 13 May 2024 08:42:34 +0000
Subject: [PATCH 1/2] Vibrator: Set Soong Config variable - kernel_ver

Bug: 340148508
Test: Build and check fw files in all devices.
Change-Id: Ic0e1a84d606f2cb86d498b2508babd126a11eda0
---
 device-husky.mk      | 1 +
 device-ripcurrent.mk | 1 +
 device-shiba.mk      | 1 +
 3 files changed, 3 insertions(+)

diff --git a/device-husky.mk b/device-husky.mk
index 0cf8269..7115839 100644
--- a/device-husky.mk
+++ b/device-husky.mk
@@ -365,6 +365,7 @@ PRODUCT_COPY_FILES += \
 	device/google/shusky/husky/panel_config_google-hk3_cal0.pb:$(TARGET_COPY_OUT_VENDOR)/etc/panel_config_google-hk3_cal0.pb
 
 # Vibrator HAL
+$(call soong_config_set,haptics,kernel_ver,v$(subst .,_,$(TARGET_LINUX_KERNEL_VERSION)))
 ACTUATOR_MODEL := luxshare_ict_081545
 ADAPTIVE_HAPTICS_FEATURE := adaptive_haptics_v1
 PRODUCT_VENDOR_PROPERTIES += \
diff --git a/device-ripcurrent.mk b/device-ripcurrent.mk
index ffbceb7..a399216 100644
--- a/device-ripcurrent.mk
+++ b/device-ripcurrent.mk
@@ -265,6 +265,7 @@ PRODUCT_VENDOR_PROPERTIES += \
     persist.vendor.camera.front_720P_always_binning=true
 
 # Vibrator HAL
+$(call soong_config_set,haptics,kernel_ver,v$(subst .,_,$(TARGET_LINUX_KERNEL_VERSION)))
 ACTUATOR_MODEL := luxshare_ict_081545
 PRODUCT_VENDOR_PROPERTIES += \
     persist.vendor.vibrator.hal.chirp.enabled=0 \
diff --git a/device-shiba.mk b/device-shiba.mk
index 72b9902..9ee212d 100644
--- a/device-shiba.mk
+++ b/device-shiba.mk
@@ -341,6 +341,7 @@ PRODUCT_PRODUCT_PROPERTIES += ro.odm.build.media_performance_class=34
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.display.lbe.supported=1
 
 # Vibrator HAL
+$(call soong_config_set,haptics,kernel_ver,v$(subst .,_,$(TARGET_LINUX_KERNEL_VERSION)))
 ACTUATOR_MODEL := luxshare_ict_081545
 ADAPTIVE_HAPTICS_FEATURE := adaptive_haptics_v1
 PRODUCT_VENDOR_PROPERTIES += \

From 8ecee7602b429fac145bc39ea90310a7a3473fd7 Mon Sep 17 00:00:00 2001
From: Pawan Wagh <waghpawan@google.com>
Date: Mon, 20 May 2024 16:06:52 +0000
Subject: [PATCH 2/2] Use BOARD_16K_OTA_USE_INCREMENTAL for shusky

Bug: 340987520
Bug: 295035851
Test: Boot and test dev options with incremental OTAs
Test: boot shiba and check size difference in boot_ota_16k.zip
boot_ota_4k.zip
Without incremental OTA -> Total size 32 MiB
out/target/product/shiba$ ls -l --block-size=M | grep boot_ota
-rw-r--r--  1 waghpawan primarygroup   16M May 20 17:11 boot_ota_16k.zip
-rw-r--r--  1 waghpawan primarygroup   16M May 20 17:11 boot_ota_4k.zip

With incremental OTA -> Total size 12 MiB
 ls -l --block-size=M | grep boot_ota
-rw-r--r--  1 waghpawan primarygroup    6M May 20 16:14 boot_ota_16k.zip
-rw-r--r--  1 waghpawan primarygroup    6M May 20 16:14 boot_ota_4k.zip


Change-Id: I52e07fdc7f781f0c59ac6957e34af1967a3efb92
---
 BoardConfig-shusky-common.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/BoardConfig-shusky-common.mk b/BoardConfig-shusky-common.mk
index b7c5f1e..d23edb3 100644
--- a/BoardConfig-shusky-common.mk
+++ b/BoardConfig-shusky-common.mk
@@ -27,4 +27,6 @@ BOARD_KERNEL_MODULES_16K := $(foreach module,$(BOARD_KERNEL_MODULES_16K),$(TARGE
 # Shusky targets use exynos-bcm_dbg.ko module instead of bcm_dbg.ko.
 BOARD_KERNEL_MODULES_16K := $(filter-out %/bcm_dbg.ko,$(BOARD_KERNEL_MODULES_16K))
 BOARD_KERNEL_MODULES_LOAD_16K := $(foreach module,$(BOARD_KERNEL_MODULES_16K),$(notdir $(module)))
+
+BOARD_16K_OTA_USE_INCREMENTAL := true
 endif
\ No newline at end of file