From 7a5f30f16bb25d8e297a38c8489d76909d53a115 Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Wed, 28 Jul 2021 17:44:01 -0700 Subject: [PATCH] remove nav sconscript hack (#21768) * remove nav sconscript hack * pc files --- .github/workflows/selfdrive_tests.yaml | 2 ++ release/files_pc | 3 +++ selfdrive/ui/SConscript | 5 ++--- 3 files changed, 7 insertions(+), 3 deletions(-) create mode 100644 release/files_pc diff --git a/.github/workflows/selfdrive_tests.yaml b/.github/workflows/selfdrive_tests.yaml index cd6078c19..f915235c0 100644 --- a/.github/workflows/selfdrive_tests.yaml +++ b/.github/workflows/selfdrive_tests.yaml @@ -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 diff --git a/release/files_pc b/release/files_pc new file mode 100644 index 000000000..1b57f97a7 --- /dev/null +++ b/release/files_pc @@ -0,0 +1,3 @@ +phonelibs/mapbox-gl-native-qt/x86_64/** + +phonelibs/qt-plugins/x86_64/** diff --git a/selfdrive/ui/SConscript b/selfdrive/ui/SConscript index 15a9d76a5..a283abbb1 100644 --- a/selfdrive/ui/SConscript +++ b/selfdrive/ui/SConscript @@ -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