openpilot v0.8.14 release

date: 2022-05-24T01:48:37
master commit: 71901c94dbbaa2f9f156a80c14cc7ea65219fc7c

selfdrive/ui/SConscript

@@ -7,9 +7,6 @@ base_libs = [gpucommon, common, messaging, cereal, visionipc, transformations, '
 
 maps = arch in ['larch64', 'x86_64']
 
-if arch == 'aarch64':
-  base_libs += ['log', 'utils', 'gui', 'ui', 'CB', 'gsl', 'adreno_utils', 'cutils', 'uuid']
-
 if maps and arch == 'x86_64':
   rpath = [Dir(f"#third_party/mapbox-gl-native-qt/{arch}").srcnode().abspath]
   qt_env["RPATH"] += rpath
@@ -18,14 +15,11 @@ if arch == "Darwin":
   del base_libs[base_libs.index('OpenCL')]
   qt_env['FRAMEWORKS'] += ['OpenCL']
 
-widgets_src = ["qt/util.cc", "qt/widgets/input.cc", "qt/widgets/drive_stats.cc",
+widgets_src = ["ui.cc", "qt/util.cc", "qt/widgets/input.cc", "qt/widgets/drive_stats.cc",
                "qt/widgets/ssh_keys.cc", "qt/widgets/toggle.cc", "qt/widgets/controls.cc",
                "qt/widgets/offroad_alerts.cc", "qt/widgets/prime.cc", "qt/widgets/keyboard.cc",
                "qt/widgets/scrollview.cc", "qt/widgets/cameraview.cc", "#third_party/qrcode/QrCode.cc", "qt/api.cc",
-               "qt/request_repeater.cc", "qt/qt_window.cc"]
-
-if arch != 'aarch64':
-  widgets_src += ["qt/offroad/networking.cc", "qt/offroad/wifiManager.cc"]
+               "qt/request_repeater.cc", "qt/qt_window.cc", "qt/offroad/networking.cc", "qt/offroad/wifiManager.cc"]
 
 qt_env['CPPDEFINES'] = []
 if maps:
@@ -56,14 +50,14 @@ qt_env.Program("qt/text", ["qt/text.cc"], LIBS=qt_libs)
 qt_env.Program("qt/spinner", ["qt/spinner.cc"], LIBS=qt_libs)
 
 # build main UI
-qt_src = ["main.cc", "ui.cc", "qt/sidebar.cc", "qt/onroad.cc",
+qt_src = ["main.cc", "qt/sidebar.cc", "qt/onroad.cc", "qt/body.cc",
           "qt/window.cc", "qt/home.cc", "qt/offroad/settings.cc",
           "qt/offroad/onboarding.cc", "qt/offroad/driverview.cc"]
 qt_env.Program("_ui", qt_src + [asset_obj], LIBS=qt_libs)
 
 
 # setup and factory resetter
-if arch != 'aarch64' and GetOption('extras'):
+if GetOption('extras'):
   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],
                  LIBS=qt_libs + ['curl', 'common', 'json11'])
@@ -80,8 +74,8 @@ if GetOption('extras'):
   senv = qt_env.Clone()
   senv['LINKFLAGS'].append('-Wl,-strip-debug')
 
-  release = "release3" if arch == 'larch64' else "release2"
-  dashcam = "dashcam3" if arch == 'larch64' else "dashcam"
+  release = "release3"
+  dashcam = "dashcam3"
   installers = [
     ("openpilot", release),
     ("openpilot_test", f"{release}-staging"),