build extras together (#26051)

* build extras together

* don't check here either
old-commit-hash: 8b5ebbddf6

SConstruct

@@ -431,6 +431,7 @@ SConscript(['selfdrive/sensord/SConscript'])
 SConscript(['selfdrive/ui/SConscript'])
 SConscript(['selfdrive/navd/SConscript'])
 
+if arch in ['x86_64', 'Darwin'] or GetOption('extras'):
   SConscript(['tools/replay/SConscript'])
 
   opendbc = abspath([File('opendbc/can/libdbc.so')])

tools/cabana/SConscript

@@ -11,7 +11,6 @@ else:
   base_libs.append('OpenCL')
 
 qt_libs = ['qt_util', 'Qt5Charts'] + base_libs
-if arch in ['x86_64', 'Darwin'] and GetOption('extras'):
 cabana_libs = [widgets, cereal, messaging, visionipc, replay_lib, opendbc,'avutil', 'avcodec', 'avformat', 'bz2', 'curl', 'yuv'] + qt_libs
 qt_env.Program('_cabana', ['cabana.cc', 'mainwin.cc', 'chartswidget.cc', 'historylog.cc', 'videowidget.cc', 'signaledit.cc', 'dbcmanager.cc',
                             'canmessages.cc', 'messageswidget.cc', 'detailwidget.cc'], LIBS=cabana_libs, FRAMEWORKS=base_frameworks)

tools/replay/SConscript

@@ -12,7 +12,6 @@ else:
   base_libs.append('OpenCL')
 
 qt_libs = ['qt_util'] + base_libs
-if arch in ['x86_64', 'Darwin'] or GetOption('extras'):
 qt_env['CXXFLAGS'] += ["-Wno-deprecated-declarations"]
 
 replay_lib_src = ["replay.cc", "consoleui.cc", "camera.cc", "filereader.cc", "logreader.cc", "framereader.cc", "route.cc", "util.cc"]