diff --git a/SConstruct b/SConstruct index 086b012dd..95388976d 100644 --- a/SConstruct +++ b/SConstruct @@ -44,7 +44,6 @@ if arch == "aarch64" or arch == "larch64": libpath = [ "/usr/lib", - "/data/data/com.termux/files/usr/lib", "/system/vendor/lib64", "/system/comma/usr/lib", "#phonelibs/nanovg", @@ -62,11 +61,12 @@ if arch == "aarch64" or arch == "larch64": else: libpath += [ "#phonelibs/snpe/aarch64", - "#phonelibs/libyuv/lib" + "#phonelibs/libyuv/lib", + "/system/vendor/lib64" ] cflags = ["-DQCOM", "-mcpu=cortex-a57"] cxxflags = ["-DQCOM", "-mcpu=cortex-a57"] - rpath = ["/system/vendor/lib64"] + rpath = [] if QCOM_REPLAY: cflags += ["-DQCOM_REPLAY"] diff --git a/selfdrive/modeld/SConscript b/selfdrive/modeld/SConscript index 6f9f6608e..1ca3f7db0 100644 --- a/selfdrive/modeld/SConscript +++ b/selfdrive/modeld/SConscript @@ -1,7 +1,7 @@ Import('env', 'arch', 'cereal', 'messaging', 'common', 'gpucommon', 'visionipc') lenv = env.Clone() -libs = [cereal, messaging, common, 'OpenCL', 'SNPE', 'capnp', 'zmq', 'kj', 'yuv', gpucommon, visionipc] +libs = [cereal, messaging, common, 'OpenCL', 'SNPE', 'symphony-cpu', 'capnp', 'zmq', 'kj', 'yuv', gpucommon, visionipc] TEST_THNEED = False