From 79c3040629cc7390ffad9e081c165dc03846699f Mon Sep 17 00:00:00 2001
From: hedger <hedger@users.noreply.github.com>
Date: Wed, 19 Oct 2022 18:28:48 +0400
Subject: [PATCH] fbt: fixed dependency issues with SDK definition file (#1893)

* fbt: fixed dependency issues with SDK definition file
* fbt: more path fixes; marked up new symbols
---
 firmware.scons                      | 2 +-
 firmware/SConscript                 | 4 +++-
 firmware/targets/f7/api_symbols.csv | 5 ++++-
 scripts/fbt_tools/fbt_extapps.py    | 4 ++--
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/firmware.scons b/firmware.scons
index d28309d0e..5219a2f3b 100644
--- a/firmware.scons
+++ b/firmware.scons
@@ -329,7 +329,7 @@ if fwenv["IS_BASE_FIRMWARE"]:
     # AlwaysBuild(sdk_tree)
     Alias("sdk_tree", sdk_tree)
 
-    sdk_apicheck = fwenv.SDKSymUpdater(fwenv.subst("$SDK_DEFINITION"), "sdk_origin")
+    sdk_apicheck = fwenv.SDKSymUpdater(fwenv["SDK_DEFINITION"], "sdk_origin")
     Precious(sdk_apicheck)
     NoClean(sdk_apicheck)
     AlwaysBuild(sdk_apicheck)
diff --git a/firmware/SConscript b/firmware/SConscript
index 5795e242b..2285a6f2c 100644
--- a/firmware/SConscript
+++ b/firmware/SConscript
@@ -9,8 +9,10 @@ env.Append(
         File("#/firmware/targets/f7/platform_specific/intrinsic_export.h"),
     ],
 )
-env.SetDefault(SDK_DEFINITION=env.File("./targets/f${TARGET_HW}/api_symbols.csv"))
 
+env.SetDefault(
+    SDK_DEFINITION=env.File("./targets/f${TARGET_HW}/api_symbols.csv").srcnode()
+)
 
 libenv = env.Clone(FW_LIB_NAME="flipper${TARGET_HW}")
 libenv.Append(
diff --git a/firmware/targets/f7/api_symbols.csv b/firmware/targets/f7/api_symbols.csv
index 33e289948..d3d5a9010 100644
--- a/firmware/targets/f7/api_symbols.csv
+++ b/firmware/targets/f7/api_symbols.csv
@@ -1,5 +1,5 @@
 entry,status,name,type,params
-Version,+,2.3,,
+Version,+,2.4,,
 Header,+,applications/services/bt/bt_service/bt.h,,
 Header,+,applications/services/cli/cli.h,,
 Header,+,applications/services/cli/cli_vcp.h,,
@@ -929,6 +929,7 @@ Function,+,furi_hal_bt_nvm_sram_sem_release,void,
 Function,+,furi_hal_bt_reinit,void,
 Function,+,furi_hal_bt_serial_notify_buffer_is_empty,void,
 Function,+,furi_hal_bt_serial_set_event_callback,void,"uint16_t, FuriHalBtSerialCallback, void*"
+Function,+,furi_hal_bt_serial_set_rpc_status,void,FuriHalBtSerialRpcStatus
 Function,+,furi_hal_bt_serial_start,void,
 Function,+,furi_hal_bt_serial_stop,void,
 Function,+,furi_hal_bt_serial_tx,_Bool,"uint8_t*, uint16_t"
@@ -2071,6 +2072,7 @@ Function,-,select,int,"int, fd_set*, fd_set*, fd_set*, timeval*"
 Function,-,serial_svc_is_started,_Bool,
 Function,-,serial_svc_notify_buffer_is_empty,void,
 Function,-,serial_svc_set_callbacks,void,"uint16_t, SerialServiceEventCallback, void*"
+Function,-,serial_svc_set_rpc_status,void,SerialServiceRpcStatus
 Function,-,serial_svc_start,void,
 Function,-,serial_svc_stop,void,
 Function,-,serial_svc_update_tx,_Bool,"uint8_t*, uint16_t"
@@ -2467,6 +2469,7 @@ Function,+,variable_item_list_set_enter_callback,void,"VariableItemList*, Variab
 Function,+,variable_item_list_set_selected_item,void,"VariableItemList*, uint8_t"
 Function,+,variable_item_set_current_value_index,void,"VariableItem*, uint8_t"
 Function,+,variable_item_set_current_value_text,void,"VariableItem*, const char*"
+Function,+,variable_item_set_values_count,void,"VariableItem*, uint8_t"
 Function,-,vasiprintf,int,"char**, const char*, __gnuc_va_list"
 Function,-,vasniprintf,char*,"char*, size_t*, const char*, __gnuc_va_list"
 Function,-,vasnprintf,char*,"char*, size_t*, const char*, __gnuc_va_list"
diff --git a/scripts/fbt_tools/fbt_extapps.py b/scripts/fbt_tools/fbt_extapps.py
index 9f81d4145..e40a4efc2 100644
--- a/scripts/fbt_tools/fbt_extapps.py
+++ b/scripts/fbt_tools/fbt_extapps.py
@@ -145,7 +145,7 @@ def BuildAppElf(env, app):
 
 
 def prepare_app_metadata(target, source, env):
-    sdk_cache = SdkCache(env.subst("$SDK_DEFINITION"), load_version_only=True)
+    sdk_cache = SdkCache(env["SDK_DEFINITION"].path, load_version_only=True)
 
     if not sdk_cache.is_buildable():
         raise UserError(
@@ -166,7 +166,7 @@ def prepare_app_metadata(target, source, env):
 
 
 def validate_app_imports(target, source, env):
-    sdk_cache = SdkCache(env.subst("$SDK_DEFINITION"), load_version_only=False)
+    sdk_cache = SdkCache(env["SDK_DEFINITION"].path, load_version_only=False)
     app_syms = set()
     with open(target[0].path, "rt") as f:
         for line in f: