diff --git a/selfdrive/modeld/dmonitoringmodeld b/selfdrive/modeld/dmonitoringmodeld index e84bbbf373..5f5bc876d2 100755 --- a/selfdrive/modeld/dmonitoringmodeld +++ b/selfdrive/modeld/dmonitoringmodeld @@ -1,15 +1,16 @@ #!/bin/sh +DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null && pwd)" +cd $DIR + if [ -d /system ]; then - if [ -f /TICI ]; then # QCOM2 - export LD_LIBRARY_PATH="/usr/lib/aarch64-linux-gnu:/data/pythonpath/phonelibs/snpe/larch64:$LD_LIBRARY_PATH" - else # QCOM - export LD_LIBRARY_PATH="/data/pythonpath/phonelibs/snpe/aarch64/:$LD_LIBRARY_PATH" - fi - export ADSP_LIBRARY_PATH="/data/pythonpath/phonelibs/snpe/dsp/" + if [ -f /TICI ]; then # QCOM2 + export LD_LIBRARY_PATH="/usr/lib/aarch64-linux-gnu:/data/pythonpath/phonelibs/snpe/larch64:$LD_LIBRARY_PATH" + else # QCOM + export LD_LIBRARY_PATH="/data/pythonpath/phonelibs/snpe/aarch64/:$LD_LIBRARY_PATH" + fi else - # PC - export LD_LIBRARY_PATH="$HOME/openpilot/phonelibs/snpe/x86_64-linux-clang:/openpilot/phonelibs/snpe/x86_64:$HOME/openpilot/phonelibs/snpe/x86_64:$LD_LIBRARY_PATH" + # PC + export LD_LIBRARY_PATH="$DIR/../../phonelibs/snpe/x86_64-linux-clang:$DIR/../../openpilot/phonelibs/snpe/x86_64:$LD_LIBRARY_PATH" fi - exec ./_dmonitoringmodeld diff --git a/selfdrive/modeld/modeld b/selfdrive/modeld/modeld index 1b67842ab1..f3a7c24081 100755 --- a/selfdrive/modeld/modeld +++ b/selfdrive/modeld/modeld @@ -1,6 +1,7 @@ #!/bin/sh DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null && pwd)" +cd $DIR if [ -d /system ]; then if [ -f /TICI ]; then # QCOM2 diff --git a/selfdrive/sensord/sensord b/selfdrive/sensord/sensord index 71509d05e4..5b33173256 100755 --- a/selfdrive/sensord/sensord +++ b/selfdrive/sensord/sensord @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ed52dac08364c5582ae5f7ab3ab8d541014d90a9acfeddd287817695ca0260b9 -size 82 +oid sha256:35a7b4ad9a5abb16a835a8c652c66bb541c6694d65bf0523e7b7f091206bf8af +size 103 diff --git a/selfdrive/ui/soundd b/selfdrive/ui/soundd index e658062b7d..7517a1112c 100755 --- a/selfdrive/ui/soundd +++ b/selfdrive/ui/soundd @@ -1,3 +1,4 @@ #!/bin/sh +cd "$(dirname "$0")" export LD_LIBRARY_PATH="/system/lib64:$LD_LIBRARY_PATH" exec ./_soundd diff --git a/selfdrive/ui/ui b/selfdrive/ui/ui index 0645287490..36341a7ee5 100755 --- a/selfdrive/ui/ui +++ b/selfdrive/ui/ui @@ -1,4 +1,5 @@ #!/bin/sh +cd "$(dirname "$0")" export LD_LIBRARY_PATH="/system/lib64:$LD_LIBRARY_PATH" export QT_PLUGIN_PATH="../../phonelibs/qt-plugins/$(uname -m)" exec ./_ui