changes to scons files

SippieCup · Apr 8, 2020 · 795d90c · 795d90c
1 parent 6318e6b
commit 795d90c
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 10 deletions.
diff --git a/selfdrive/camerad/SConscript b/selfdrive/camerad/SConscript
@@ -3,14 +3,16 @@ Import('env', 'arch', 'messaging', 'is_tbp', 'common', 'gpucommon', 'visionipc',
 libs = ['m', 'pthread', common, 'jpeg', 'json', cereal, 'OpenCL', messaging, 'czmq', 'zmq', 'capnp', 'kj', 'capnp_c', visionipc, gpucommon]
 
 if is_tbp:
-  arch =  "aarch64_TBP"
-if arch == "aarch64":
+  larch =  "aarch64_TBP"
+else:
+  larch = arch
+if larch == "aarch64":
   libs += ['gsl', 'CB', 'adreno_utils', 'EGL', 'GLESv3', 'cutils', 'ui']
   cameras = ['cameras/camera_qcom.c']
-elif arch == "larch64":
+elif larch == "larch64":
   libs += []
   cameras = ['cameras/camera_qcom2.c']
-elif arch == "aarch64_TBP":
+elif larch == "aarch64_TBP":
     libs += ['opencv_core', 'opencv_highgui', 'opencv_video', 'opencv_imgproc', 'opencv_videoio']
     cameras = ['cameras/camera_webcam.cc']
     env = env.Clone()

diff --git a/selfdrive/manager.py b/selfdrive/manager.py
@@ -222,7 +222,7 @@ def get_running():
 ]
 
 if not WEBCAM:
-    car_start_processes += [
+    car_started_processes += [
        'proclogd',
     ]
 

diff --git a/selfdrive/modeld/SConscript b/selfdrive/modeld/SConscript
@@ -9,10 +9,12 @@ common_src = [
   "transforms/loadyuv.c",
   "transforms/transform.c"]
 if is_tbp:
-  arch = "aarch64_TBP"
-if arch == "aarch64":
+  larch = "aarch64_TBP"
+else:
+  larch = arch
+if larch == "aarch64":
   libs += ['SNPE', 'gsl', 'CB', 'gnustl_shared']
-elif arch == "aarch64_TBP":
+elif larch == "aarch64_TBP":
   libs += ['pthread']
   # for tensorflow support
   common_src = [

diff --git a/selfdrive/ui/SConscript b/selfdrive/ui/SConscript
@@ -4,8 +4,10 @@ src = ['ui.cc', 'paint.cc', 'sidebar.cc', '#phonelibs/nanovg/nanovg.c']
 libs = [common, 'zmq', 'czmq', 'capnp', 'capnp_c', 'm', cereal, messaging, gpucommon, visionipc]
 
 if is_tbp:
-  arch = "aarch64_TBP"
-if arch == "aarch64":
+  larch = "aarch64_TBP"
+else:
+  larch = arch
+if larch == "aarch64":
   src += ['sound.cc', 'slplay.c']
   libs += ['EGL', 'GLESv3', 'gnustl_shared', 'log', 'utils', 'gui', 'hardware', 'ui', 'CB', 'gsl', 'adreno_utils', 'OpenSLES', 'cutils', 'uuid', 'OpenCL']
   linkflags = ['-Wl,-rpath=/system/lib64,-rpath=/system/comma/usr/lib']