From 841768e76865a701abd4ac6c75b79c41b7f8ad7e Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Fri, 23 Aug 2024 18:14:43 -0700 Subject: [PATCH] ui: move more builds behind --minimal (#33368) old-commit-hash: 5cb7aed8cefc4cd8345ccfc3cbb4fee3b1977dc6 --- selfdrive/ui/SConscript | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/selfdrive/ui/SConscript b/selfdrive/ui/SConscript index 325fe231ce..63a795e0b7 100644 --- a/selfdrive/ui/SConscript +++ b/selfdrive/ui/SConscript @@ -61,12 +61,6 @@ qt_env.Command(assets, [assets_src, translations_assets_src], f"rcc $SOURCES -o qt_env.Depends(assets, Glob('#selfdrive/assets/*', exclude=[assets, assets_src, translations_assets_src, "#selfdrive/assets/assets.o"]) + [lrelease]) asset_obj = qt_env.Object("assets", assets) -qt_env.SharedLibrary("qt/python_helpers", ["qt/qt_window.cc"], LIBS=qt_libs) - -# spinner and text window -qt_env.Program("_text", ["qt/text.cc"], LIBS=qt_libs) -qt_env.Program("_spinner", ["qt/spinner.cc"], LIBS=qt_libs) - # build main UI qt_env.Program("ui", qt_src + [asset_obj], LIBS=qt_libs) if GetOption('extras'): @@ -74,8 +68,14 @@ if GetOption('extras'): qt_env.Program('tests/test_translations', [asset_obj, 'tests/test_runner.cc', 'tests/test_translations.cc'] + qt_src, LIBS=qt_libs) qt_env.Program('tests/ui_snapshot', [asset_obj, "tests/ui_snapshot.cc"] + qt_src, LIBS=qt_libs) - if GetOption('extras') and arch != "Darwin": + qt_env.SharedLibrary("qt/python_helpers", ["qt/qt_window.cc"], LIBS=qt_libs) + + # spinner and text window + qt_env.Program("_text", ["qt/text.cc"], LIBS=qt_libs) + qt_env.Program("_spinner", ["qt/spinner.cc"], LIBS=qt_libs) + + # setup and factory resetter qt_env.Program("qt/setup/reset", ["qt/setup/reset.cc"], LIBS=qt_libs) qt_env.Program("qt/setup/setup", ["qt/setup/setup.cc", asset_obj],