commit fc326dd3ed52ee6a28df2e99b17306d76203d024
author Nolen Johnson <johnsonnolen@gmail.com> Sat Mar 18 00:31:32 2023 -0400
committer Jackeagle <jackeagle102@gmail.com> Wed Aug 02 22:26:27 2023 -0400
tree d520b2c2fa63fec53ae9bea8d638fd5e88d63fd1
parent 97890e3484b559c9d1f7cc0b2a443e82823f8d40

soong: Bring bootloader_message_offset back

This is squashed revert of:

    Revert "config: Remove BOOTLOADER_MESSAGE_OFFSET"

    This reverts commit a8bbd0e4aa41915818774984e04c977afe234498.

    Change-Id: I66df34e901e87e543102377469a150a9bf03e5b8

    Revert "Revert "soong: Export bootloader_message_offset to dependencies""

    This reverts commit d0b4f9894add43e5caa8720575391e781cab2cf2.

    Reason for revert: Bringing this back, LGE 8996 lives.

    Change-Id: Iae68fee53ba647d8c64c54388e7296232adf4db8

Change-Id: I358d8e19f2d4da590c9579c1473b5f1964bb71aa
Signed-off-by: Jackeagle <jackeagle102@gmail.com>

build/soong/Android.bp

diff --git a/build/soong/Android.bp b/build/soong/Android.bp
index 6f1d4f1..2068301 100644
--- a/build/soong/Android.bp
+++ b/build/soong/Android.bp
@@ -236,6 +236,27 @@
 }
 
 soong_config_module_type {
+    name: "bootloader_message_offset",
+    module_type: "cc_defaults",
+    config_namespace: "blissGlobalVars",
+    value_variables: ["bootloader_message_offset"],
+    properties: [
+        "cflags",
+        "export_cflags",
+    ],
+}
+
+bootloader_message_offset {
+    name: "bootloader_message_offset_defaults",
+    soong_config_variables: {
+        bootloader_message_offset: {
+            cflags: ["-DBOARD_RECOVERY_BLDRMSG_OFFSET=%s"],
+            export_cflags: ["-DBOARD_RECOVERY_BLDRMSG_OFFSET=%s"],
+        },
+    },
+}
+
+soong_config_module_type {
     name: "egl_display_array",
     module_type: "cc_defaults",
     config_namespace: "blissGlobalVars",

config/BoardConfigSoong.mk

diff --git a/config/BoardConfigSoong.mk b/config/BoardConfigSoong.mk
index 4b2d68c..54a4063 100644
--- a/config/BoardConfigSoong.mk
+++ b/config/BoardConfigSoong.mk
@@ -30,6 +30,7 @@
 SOONG_CONFIG_blissGlobalVars += \
     aapt_version_code \
     additional_gralloc_10_usage_bits \
+    bootloader_message_offset \
     camera_needs_client_info \
     target_init_vendor_lib \
     target_inputdispatcher_skip_event_key \
@@ -78,6 +79,7 @@
 SOONG_CONFIG_blissGlobalVars_uses_nothing_camera := $(TARGET_USES_NOTHING_CAMERA)
 
 # Set default values
+BOOTLOADER_MESSAGE_OFFSET ?= 0
 TARGET_ADDITIONAL_GRALLOC_10_USAGE_BITS ?= 0
 TARGET_GRALLOC_HANDLE_HAS_RESERVED_SIZE ?= false
 TARGET_INIT_VENDOR_LIB ?= vendor_init
@@ -86,6 +88,7 @@
 
 # Soong value variables
 SOONG_CONFIG_blissGlobalVars_aapt_version_code := $(shell date -u +%Y%m%d)
+SOONG_CONFIG_blissGlobalVars_bootloader_message_offset := $(BOOTLOADER_MESSAGE_OFFSET)
 SOONG_CONFIG_blissGlobalVars_additional_gralloc_10_usage_bits := $(TARGET_ADDITIONAL_GRALLOC_10_USAGE_BITS)
 SOONG_CONFIG_blissGlobalVars_target_init_vendor_lib := $(TARGET_INIT_VENDOR_LIB)
 SOONG_CONFIG_blissGlobalVars_target_ld_shim_libs := $(subst $(space),:,$(TARGET_LD_SHIM_LIBS))