mount/flipperzero-firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fbt: fixed dependency issues with SDK definition file (#1893)

Browse Source 
* fbt: fixed dependency issues with SDK definition file
* fbt: more path fixes; marked up new symbols
This commit is contained in:
hedger 2022-10-19 18:28:48 +04:00 committed by GitHub
parent 72713d6f4e
commit 79c3040629
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware.scons
View File

@ -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)

4
firmware/SConscript
View File

@ -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(

5
firmware/targets/f7/api_symbols.csv
View File

@ -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"

1 entry status name type params
2 Version + 2.3 2.4
3 Header + applications/services/bt/bt_service/bt.h
4 Header + applications/services/cli/cli.h
5 Header + applications/services/cli/cli_vcp.h
929 Function + furi_hal_bt_reinit void
930 Function + furi_hal_bt_serial_notify_buffer_is_empty void
931 Function + furi_hal_bt_serial_set_event_callback void uint16_t, FuriHalBtSerialCallback, void*
932 Function + furi_hal_bt_serial_set_rpc_status void FuriHalBtSerialRpcStatus
933 Function + furi_hal_bt_serial_start void
934 Function + furi_hal_bt_serial_stop void
935 Function + furi_hal_bt_serial_tx _Bool uint8_t*, uint16_t
2072 Function - serial_svc_is_started _Bool
2073 Function - serial_svc_notify_buffer_is_empty void
2074 Function - serial_svc_set_callbacks void uint16_t, SerialServiceEventCallback, void*
2075 Function - serial_svc_set_rpc_status void SerialServiceRpcStatus
2076 Function - serial_svc_start void
2077 Function - serial_svc_stop void
2078 Function - serial_svc_update_tx _Bool uint8_t*, uint16_t
2469 Function + variable_item_list_set_selected_item void VariableItemList*, uint8_t
2470 Function + variable_item_set_current_value_index void VariableItem*, uint8_t
2471 Function + variable_item_set_current_value_text void VariableItem*, const char*
2472 Function + variable_item_set_values_count void VariableItem*, uint8_t
2473 Function - vasiprintf int char**, const char*, __gnuc_va_list
2474 Function - vasniprintf char* char*, size_t*, const char*, __gnuc_va_list
2475 Function - vasnprintf char* char*, size_t*, const char*, __gnuc_va_list

4
scripts/fbt_tools/fbt_extapps.py
View File

@ -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: