Merge common/ and selfdrive/common (#24556)

* Merge common/ and selfdrive/common

* fix that

* fix version

* fix unit tests
old-commit-hash: cb8885cffb313bea258c012c3026461a22bf8135
This commit is contained in:
Adeeb Shihadeh
2022-05-18 14:11:57 -07:00
committed by GitHub
parent eea872ae98
commit f4675fc260
140 changed files with 288 additions and 287 deletions
+6 -7
View File
@@ -130,7 +130,7 @@ else:
"#third_party/libyuv/x64/lib",
"#third_party/mapbox-gl-native-qt/x86_64",
"#cereal",
"#selfdrive/common",
"#common",
"/usr/lib",
"/usr/local/lib",
]
@@ -138,7 +138,7 @@ else:
rpath += [
Dir("#third_party/snpe/x86_64-linux-clang").abspath,
Dir("#cereal").abspath,
Dir("#selfdrive/common").abspath
Dir("#common").abspath
]
if GetOption('asan'):
@@ -156,8 +156,8 @@ if arch != "Darwin":
ldflags += ["-Wl,--as-needed", "-Wl,--no-undefined"]
# Enable swaglog include in submodules
cflags += ['-DSWAGLOG="\\"selfdrive/common/swaglog.h\\""']
cxxflags += ['-DSWAGLOG="\\"selfdrive/common/swaglog.h\\""']
cflags += ['-DSWAGLOG="\\"common/swaglog.h\\""']
cxxflags += ['-DSWAGLOG="\\"common/swaglog.h\\""']
env = Environment(
ENV=lenv,
@@ -212,7 +212,7 @@ env = Environment(
"#third_party",
"#opendbc/can",
"#selfdrive/boardd",
"#selfdrive/common",
"#common",
],
CYTHONCFILESUFFIX=".cpp",
COMPILATIONDB_USE_ABSPATH=True,
@@ -330,7 +330,7 @@ if GetOption("clazy"):
Export('env', 'qt_env', 'arch', 'real_arch', 'SHARED', 'USE_WEBCAM')
SConscript(['selfdrive/common/SConscript'])
SConscript(['common/SConscript'])
Import('_common', '_gpucommon', '_gpu_libs')
if SHARED:
@@ -384,7 +384,6 @@ SConscript(['opendbc/can/SConscript'])
SConscript(['third_party/SConscript'])
SConscript(['common/SConscript'])
SConscript(['common/kalman/SConscript'])
SConscript(['common/transformations/SConscript'])