Merge branch 'fz-dev' into dev

site_scons/commandline.scons

@@ -81,16 +81,6 @@ vars.AddVariables(
             "7",
         ],
     ),
-    BoolVariable(
-        "DEBUG_TOOLS",
-        help="Enable debug tools to be built",
-        default=False,
-    ),
-    BoolVariable(
-        "FAP_EXAMPLES",
-        help="Enable example applications to be built",
-        default=False,
-    ),
     (
         "DIST_SUFFIX",
         "Suffix for binaries in build output for dist targets",
@@ -242,9 +232,15 @@ vars.AddVariables(
             ("applications/system", False),
             ("applications/debug", False),
             ("applications/plugins", False),
+            ("applications/examples", False),
             ("applications_user", False),
         ],
     ),
+    BoolVariable(
+        "PVSNOBROWSER",
+        help="Don't open browser after generating error repots",
+        default=False,
+    ),
 )
 
 Return("vars")

site_scons/extapps.scons

@@ -65,9 +65,8 @@ class FlipperExtAppBuildArtifacts:
 apps_to_build_as_faps = [
     FlipperAppType.PLUGIN,
     FlipperAppType.EXTERNAL,
+    FlipperAppType.DEBUG,
 ]
-if appenv["DEBUG_TOOLS"]:
-    apps_to_build_as_faps.append(FlipperAppType.DEBUG)
 
 known_extapps = [
     app
@@ -143,6 +142,11 @@ sdk_apisyms = appenv.SDKSymGenerator(
     "${BUILD_DIR}/assets/compiled/symbols.h", appenv["SDK_DEFINITION"]
 )
 Alias("api_syms", sdk_apisyms)
+ENV.Replace(
+    SDK_APISYMS=sdk_apisyms,
+    _APP_ICONS=appenv["_APP_ICONS"],
+)
+
 
 if appenv["FORCE"]:
     appenv.AlwaysBuild(sdk_source, sdk_tree, sdk_apicheck, sdk_apisyms)