From 9670f8fb9f081a14d1de24f92e0800ebffbb123b Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Mon, 4 May 2020 23:33:00 -0700 Subject: [PATCH] these don't need json --- selfdrive/camerad/SConscript | 2 +- selfdrive/locationd/SConscript | 5 +---- selfdrive/loggerd/SConscript | 2 +- selfdrive/sensord/SConscript | 4 ++-- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/selfdrive/camerad/SConscript b/selfdrive/camerad/SConscript index 405be689f1..9820ba4777 100644 --- a/selfdrive/camerad/SConscript +++ b/selfdrive/camerad/SConscript @@ -1,6 +1,6 @@ Import('env', 'arch', 'messaging', 'common', 'gpucommon', 'visionipc', 'cereal', 'webcam') -libs = ['m', 'pthread', common, 'jpeg', 'json', cereal, 'OpenCL', messaging, 'czmq', 'zmq', 'capnp', 'kj', 'capnp_c', visionipc, gpucommon] +libs = ['m', 'pthread', common, 'jpeg', cereal, 'OpenCL', messaging, 'czmq', 'zmq', 'capnp', 'kj', 'capnp_c', visionipc, gpucommon] if arch == "aarch64": libs += ['gsl', 'CB', 'adreno_utils', 'EGL', 'GLESv3', 'cutils', 'ui'] diff --git a/selfdrive/locationd/SConscript b/selfdrive/locationd/SConscript index fca12d1324..45c926ee2f 100644 --- a/selfdrive/locationd/SConscript +++ b/selfdrive/locationd/SConscript @@ -3,7 +3,7 @@ loc_objs = [ "locationd_yawrate.cc", "params_learner.cc", "paramsd.cc"] -loc_libs = [messaging, 'zmq', common, 'capnp', 'kj', 'json', 'json11', 'pthread'] +loc_libs = [messaging, 'zmq', common, 'capnp', 'kj', 'json11', 'pthread'] env.Program("paramsd", loc_objs, LIBS=loc_libs) env.SharedLibrary("locationd", loc_objs, LIBS=loc_libs) @@ -19,7 +19,4 @@ env.Program("ubloxd_test", [ "ublox_msg.cc", "ubloxd_main.cc"], LIBS=loc_libs) - - - diff --git a/selfdrive/loggerd/SConscript b/selfdrive/loggerd/SConscript index 0366e47001..cb5dfa6ee9 100644 --- a/selfdrive/loggerd/SConscript +++ b/selfdrive/loggerd/SConscript @@ -3,7 +3,7 @@ Import('env', 'arch', 'messaging', 'common', 'visionipc') src = ['loggerd.cc', 'logger.cc'] libs = ['zmq', 'czmq', 'capnp', 'kj', 'z', 'avformat', 'avcodec', 'swscale', 'avutil', - 'yuv', 'bz2', common, 'json', messaging, visionipc] + 'yuv', 'bz2', common, messaging, visionipc] if arch == "aarch64": src += ['encoder.c', 'raw_logger.cc'] diff --git a/selfdrive/sensord/SConscript b/selfdrive/sensord/SConscript index 4a7f3d28fa..4c9e24329a 100644 --- a/selfdrive/sensord/SConscript +++ b/selfdrive/sensord/SConscript @@ -1,5 +1,5 @@ Import('env', 'common', 'messaging') -env.Program('_sensord', 'sensors.cc', LIBS=['hardware', common, 'json', messaging, 'capnp', 'zmq', 'kj']) +env.Program('_sensord', 'sensors.cc', LIBS=['hardware', common, messaging, 'capnp', 'zmq', 'kj']) lenv = env.Clone() lenv['LIBPATH'] += ['/system/vendor/lib64'] -lenv.Program('_gpsd', ['gpsd.cc'], LIBS=['hardware', common, 'diag', 'time_genoff', 'json', messaging, 'capnp', 'zmq', 'kj']) +lenv.Program('_gpsd', ['gpsd.cc'], LIBS=['hardware', common, 'diag', 'time_genoff', messaging, 'capnp', 'zmq', 'kj'])