spacecruft
/
nopenpilot
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

remove nav sconscript hack (#21768) 

* remove nav sconscript hack

* pc files
pull/21767/head
Adeeb Shihadeh 2021-07-28 17:44:01 -07:00 committed by GitHub
parent 6fc999fc53
commit 7a5f30f16b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/selfdrive_tests.yaml vendored
View File

@ -44,6 +44,8 @@ jobs:
run: |
mkdir $STRIPPED_DIR
cp -pR --parents $(cat release/files_common) $STRIPPED_DIR
cp -pR --parents $(cat release/files_tici) $STRIPPED_DIR
cp -pR --parents $(cat release/files_pc) $STRIPPED_DIR
cp Dockerfile.openpilot_base $STRIPPED_DIR
# need this to build on x86

3
release/files_pc 100644
View File

@ -0,0 +1,3 @@
phonelibs/mapbox-gl-native-qt/x86_64/**
phonelibs/qt-plugins/x86_64/**

5
selfdrive/ui/SConscript
View File

@ -5,13 +5,12 @@ Import('qt_env', 'arch', 'common', 'messaging', 'gpucommon', 'visionipc',
base_libs = [gpucommon, common, messaging, cereal, visionipc, transformations, 'zmq',
'capnp', 'kj', 'm', 'OpenCL', 'ssl', 'crypto', 'pthread'] + qt_env["LIBS"]
maps = arch in ['larch64', 'x86_64'] and \
os.path.exists(File("qt/maps/map.cc").srcnode().abspath)
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 in ['x86_64']:
if maps and arch == 'x86_64':
rpath = [Dir(f"#phonelibs/mapbox-gl-native-qt/{arch}").srcnode().abspath]
qt_env["RPATH"] += rpath