Merge branch 'ofwdev' into 420

scripts/fbt/elfmanifest.py

@@ -5,6 +5,7 @@ import struct
 from dataclasses import dataclass, field
 
 from .appmanifest import FlipperApplication
+from flipper.assets.icon import file2image
 
 
 _MANIFEST_MAGIC = 0x52474448
@@ -53,8 +54,6 @@ def assemble_manifest_data(
 ):
     image_data = b""
     if app_manifest.fap_icon:
-        from flipper.assets.icon import file2image
-
         image = file2image(os.path.join(app_manifest._apppath, app_manifest.fap_icon))
         if (image.width, image.height) != (10, 10):
             raise ValueError(

scripts/fbt/sdk/cache.py

@@ -89,6 +89,9 @@ class SdkCache:
         syms.update(map(lambda e: e.name, self.get_variables()))
         return syms
 
+    def get_disabled_names(self):
+        return set(map(lambda e: e.name, self.disabled_entries))
+
     def get_functions(self):
         return self._filter_enabled(self.sdk.functions)