phonelibs -> third_party (#22477)

* git mv to third_party

* find and replace

* fix release tests

* update pre-commit

* update tici bins

* update eon bins

Co-authored-by: Comma Device <device@comma.ai>

.github/workflows/selfdrive_tests.yaml

@@ -49,7 +49,7 @@ jobs:
         cp Dockerfile.openpilot_base $STRIPPED_DIR
 
         # need this to build on x86
-        cp -pR --parents phonelibs/libyuv phonelibs/snpe selfdrive/modeld/runners $STRIPPED_DIR
+        cp -pR --parents third_party/libyuv third_party/snpe selfdrive/modeld/runners $STRIPPED_DIR
     - name: Build Docker image
       run: eval "$BUILD"
     - name: Build openpilot and run checks

.pre-commit-config.yaml

@@ -38,7 +38,7 @@ repos:
         entry: cppcheck
         language: system
         types: [c++]
-        exclude: '^(phonelibs)|(pyextra)|(cereal)|(opendbc)|(panda)|(tools)|(selfdrive/modeld/thneed/debug)|(selfdrive/modeld/test)|(selfdrive/camerad/test)/|(installer)'
+        exclude: '^(third_party)|(pyextra)|(cereal)|(opendbc)|(panda)|(tools)|(selfdrive/modeld/thneed/debug)|(selfdrive/modeld/test)|(selfdrive/camerad/test)/|(installer)'
         args:
         - --error-exitcode=1
         - --language=c++

Dockerfile.openpilot

@@ -16,7 +16,7 @@ RUN pip install --no-cache-dir pipenv==2020.8.13 && \
 COPY SConstruct ${OPENPILOT_PATH}
 
 COPY ./pyextra ${OPENPILOT_PATH}/pyextra
-COPY ./phonelibs ${OPENPILOT_PATH}/phonelibs
+COPY ./third_party ${OPENPILOT_PATH}/third_party
 COPY ./site_scons ${OPENPILOT_PATH}/site_scons
 COPY ./laika ${OPENPILOT_PATH}/laika
 COPY ./laika_repo ${OPENPILOT_PATH}/laika_repo

README.md

@@ -97,8 +97,8 @@ Directory Structure
     ├── docs                # Documentation
     ├── opendbc             # Files showing how to interpret data from cars
     ├── panda               # Code used to communicate on CAN
-    ├── phonelibs           # External libraries
-    ├── pyextra             # Extra python packages not shipped in NEOS
+    ├── third_party         # External libraries
+    ├── pyextra             # Extra python packages
     └── selfdrive           # Code needed to drive the car
         ├── assets          # Fonts, images, and sounds for UI
         ├── athena          # Allows communication with the app

SConstruct

@@ -64,11 +64,11 @@ USE_FRAME_STREAM = os.getenv("USE_FRAME_STREAM") is not None
 
 lenv = {
   "PATH": os.environ['PATH'],
-  "LD_LIBRARY_PATH": [Dir(f"#phonelibs/acados/{arch}/lib").abspath],
+  "LD_LIBRARY_PATH": [Dir(f"#third_party/acados/{arch}/lib").abspath],
   "PYTHONPATH": Dir("#").abspath + ":" + Dir("#pyextra/").abspath,
 
-  "ACADOS_SOURCE_DIR": Dir("#phonelibs/acados/acados").abspath,
-  "TERA_PATH": Dir("#").abspath + f"/phonelibs/acados/{arch}/t_renderer",
+  "ACADOS_SOURCE_DIR": Dir("#third_party/acados/acados").abspath,
+  "TERA_PATH": Dir("#").abspath + f"/third_party/acados/{arch}/t_renderer",
 }
 
 rpath = lenv["LD_LIBRARY_PATH"].copy()
@@ -82,7 +82,7 @@ if arch == "aarch64" or arch == "larch64":
     lenv["ANDROID_ROOT"] = os.environ['ANDROID_ROOT']
 
   cpppath = [
-    "#phonelibs/opencl/include",
+    "#third_party/opencl/include",
   ]
 
   libpath = [
@@ -90,14 +90,14 @@ if arch == "aarch64" or arch == "larch64":
     "/usr/lib",
     "/system/vendor/lib64",
     "/system/comma/usr/lib",
-    "#phonelibs/nanovg",
-    f"#phonelibs/acados/{arch}/lib",
+    "#third_party/nanovg",
+    f"#third_party/acados/{arch}/lib",
   ]
 
   if arch == "larch64":
     libpath += [
-      "#phonelibs/snpe/larch64",
-      "#phonelibs/libyuv/larch64/lib",
+      "#third_party/snpe/larch64",
+      "#third_party/libyuv/larch64/lib",
       "/usr/lib/aarch64-linux-gnu"
     ]
     cpppath += [
@@ -109,8 +109,8 @@ if arch == "aarch64" or arch == "larch64":
   else:
     rpath = []
     libpath += [
-      "#phonelibs/snpe/aarch64",
-      "#phonelibs/libyuv/lib",
+      "#third_party/snpe/aarch64",
+      "#third_party/libyuv/lib",
       "/system/vendor/lib64"
     ]
     cflags = ["-DQCOM", "-D_USING_LIBCXX", "-mcpu=cortex-a57"]
@@ -123,7 +123,7 @@ else:
   if arch == "Darwin":
     yuv_dir = "mac" if real_arch != "arm64" else "mac_arm64"
     libpath = [
-      f"#phonelibs/libyuv/{yuv_dir}/lib",
+      f"#third_party/libyuv/{yuv_dir}/lib",
       "/usr/local/lib",
       "/opt/homebrew/lib",
       "/usr/local/opt/openssl/lib",
@@ -139,10 +139,10 @@ else:
     ]
   else:
     libpath = [
-      "#phonelibs/acados/x86_64/lib",
-      "#phonelibs/snpe/x86_64-linux-clang",
-      "#phonelibs/libyuv/x64/lib",
-      "#phonelibs/mapbox-gl-native-qt/x86_64",
+      "#third_party/acados/x86_64/lib",
+      "#third_party/snpe/x86_64-linux-clang",
+      "#third_party/libyuv/x64/lib",
+      "#third_party/mapbox-gl-native-qt/x86_64",
       "#cereal",
       "#selfdrive/common",
       "/usr/lib",
@@ -150,7 +150,7 @@ else:
     ]
 
   rpath += [
-    Dir("#phonelibs/snpe/x86_64-linux-clang").abspath,
+    Dir("#third_party/snpe/x86_64-linux-clang").abspath,
     Dir("#cereal").abspath,
     Dir("#selfdrive/common").abspath
   ]
@@ -191,25 +191,25 @@ env = Environment(
 
   CPPPATH=cpppath + [
     "#",
-    "#phonelibs/acados/include",
-    "#phonelibs/acados/include/blasfeo/include",
-    "#phonelibs/acados/include/hpipm/include",
-    "#phonelibs/catch2/include",
-    "#phonelibs/bzip2",
-    "#phonelibs/libyuv/include",
-    "#phonelibs/openmax/include",
-    "#phonelibs/json11",
-    "#phonelibs/curl/include",
-    "#phonelibs/libgralloc/include",
-    "#phonelibs/android_frameworks_native/include",
-    "#phonelibs/android_hardware_libhardware/include",
-    "#phonelibs/android_system_core/include",
-    "#phonelibs/linux/include",
-    "#phonelibs/snpe/include",
-    "#phonelibs/mapbox-gl-native-qt/include",
-    "#phonelibs/nanovg",
-    "#phonelibs/qrcode",
-    "#phonelibs",
+    "#third_party/acados/include",
+    "#third_party/acados/include/blasfeo/include",
+    "#third_party/acados/include/hpipm/include",
+    "#third_party/catch2/include",
+    "#third_party/bzip2",
+    "#third_party/libyuv/include",
+    "#third_party/openmax/include",
+    "#third_party/json11",
+    "#third_party/curl/include",
+    "#third_party/libgralloc/include",
+    "#third_party/android_frameworks_native/include",
+    "#third_party/android_hardware_libhardware/include",
+    "#third_party/android_system_core/include",
+    "#third_party/linux/include",
+    "#third_party/snpe/include",
+    "#third_party/mapbox-gl-native-qt/include",
+    "#third_party/nanovg",
+    "#third_party/qrcode",
+    "#third_party",
     "#cereal",
     "#opendbc/can",
   ],
@@ -224,7 +224,7 @@ env = Environment(
   CXXFLAGS=["-std=c++1z"] + cxxflags,
   LIBPATH=libpath + [
     "#cereal",
-    "#phonelibs",
+    "#third_party",
     "#opendbc/can",
     "#selfdrive/boardd",
     "#selfdrive/common",
@@ -403,7 +403,7 @@ SConscript(['cereal/SConscript'])
 SConscript(['panda/board/SConscript'])
 SConscript(['opendbc/can/SConscript'])
 
-SConscript(['phonelibs/SConscript'])
+SConscript(['third_party/SConscript'])
 
 SConscript(['common/SConscript'])
 SConscript(['common/kalman/SConscript'])

lgtm.yml

@@ -1,7 +1,7 @@
 path_classifiers:
   library:
     - external
-    - phonelibs
+    - third_party
     - pyextra
     - tools/lib/mkvparse
 extraction:

release/build_release2.sh

@@ -77,8 +77,8 @@ rm models/supercombo.dlc
 mkdir -p panda/board/obj
 mv /tmp/panda.bin.signed panda/board/obj/panda.bin.signed
 
-# Restore phonelibs
-git checkout phonelibs/
+# Restore third_party
+git checkout third_party/
 
 # Mark as prebuilt release
 touch prebuilt

release/build_release3.sh

@@ -68,8 +68,8 @@ rm models/supercombo.dlc
 mkdir -p panda/board/obj
 mv /tmp/panda.bin.signed panda/board/obj/panda.bin.signed
 
-# Restore phonelibs
-git checkout phonelibs/
+# Restore third_party
+git checkout third_party/
 
 # Mark as prebuilt release
 touch prebuilt

release/files_common

@@ -433,44 +433,44 @@ selfdrive/assets/offroad/*
 selfdrive/assets/sounds/*
 selfdrive/assets/training/*
 
-phonelibs/SConscript
+third_party/SConscript
 
-phonelibs/nanovg/*.c
-phonelibs/nanovg/*.h
+third_party/nanovg/*.c
+third_party/nanovg/*.h
 
-phonelibs/libgralloc/**
-phonelibs/linux/**
-phonelibs/opencl/**
-phonelibs/zlib/*
-phonelibs/bzip2/*
-phonelibs/openmax/**
+third_party/libgralloc/**
+third_party/linux/**
+third_party/opencl/**
+third_party/zlib/*
+third_party/bzip2/*
+third_party/openmax/**
 
-phonelibs/json11/json11.cpp
-phonelibs/json11/json11.hpp
+third_party/json11/json11.cpp
+third_party/json11/json11.hpp
 
-phonelibs/qrcode/*.cc
-phonelibs/qrcode/*.hpp
+third_party/qrcode/*.cc
+third_party/qrcode/*.hpp
 
-phonelibs/kaitai/*.h
-phonelibs/kaitai/*.cpp
+third_party/kaitai/*.h
+third_party/kaitai/*.cpp
 
-phonelibs/libyuv/include/**
-phonelibs/libyuv/lib/**
-phonelibs/libyuv/larch64/**
+third_party/libyuv/include/**
+third_party/libyuv/lib/**
+third_party/libyuv/larch64/**
 
-phonelibs/snpe/include/**
-phonelibs/snpe/aarch64**
-phonelibs/snpe/larch64**
-phonelibs/snpe/dsp**
+third_party/snpe/include/**
+third_party/snpe/aarch64**
+third_party/snpe/larch64**
+third_party/snpe/dsp**
 
-phonelibs/acados/x86_64/**
-phonelibs/acados/aarch64/**
-phonelibs/acados/larch64/**
-phonelibs/acados/include/**
+third_party/acados/x86_64/**
+third_party/acados/aarch64/**
+third_party/acados/larch64/**
+third_party/acados/include/**
 
-phonelibs/android_frameworks_native/**
-phonelibs/android_hardware_libhardware/**
-phonelibs/android_system_core/**
+third_party/android_frameworks_native/**
+third_party/android_hardware_libhardware/**
+third_party/android_system_core/**
 
 scripts/update_now.sh
 scripts/stop_updater.sh

release/files_pc

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

release/files_tici

@@ -1,4 +1,4 @@
-phonelibs/mapbox-gl-native-qt/include/*
+third_party/mapbox-gl-native-qt/include/*
 
 selfdrive/timezoned.py
 

selfdrive/modeld/dmonitoringmodeld

@@ -5,13 +5,13 @@ 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"
+    export LD_LIBRARY_PATH="/usr/lib/aarch64-linux-gnu:/data/pythonpath/third_party/snpe/larch64:$LD_LIBRARY_PATH"
   else # QCOM
-    export LD_LIBRARY_PATH="/data/pythonpath/phonelibs/snpe/aarch64/:$LD_LIBRARY_PATH"
+    export LD_LIBRARY_PATH="/data/pythonpath/third_party/snpe/aarch64/:$LD_LIBRARY_PATH"
   fi
-  export ADSP_LIBRARY_PATH="/data/pythonpath/phonelibs/snpe/dsp/"
+  export ADSP_LIBRARY_PATH="/data/pythonpath/third_party/snpe/dsp/"
 else
   # PC
-  export LD_LIBRARY_PATH="$DIR/../../phonelibs/snpe/x86_64-linux-clang:$DIR/../../openpilot/phonelibs/snpe/x86_64:$LD_LIBRARY_PATH"
+  export LD_LIBRARY_PATH="$DIR/../../third_party/snpe/x86_64-linux-clang:$DIR/../../openpilot/third_party/snpe/x86_64:$LD_LIBRARY_PATH"
 fi
 exec ./_dmonitoringmodeld

selfdrive/modeld/modeld

@@ -5,12 +5,12 @@ 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"
+    export LD_LIBRARY_PATH="/usr/lib/aarch64-linux-gnu:/data/pythonpath/third_party/snpe/larch64:$LD_LIBRARY_PATH"
   else # QCOM
-    export LD_LIBRARY_PATH="/data/pythonpath/phonelibs/snpe/aarch64/:$LD_LIBRARY_PATH"
+    export LD_LIBRARY_PATH="/data/pythonpath/third_party/snpe/aarch64/:$LD_LIBRARY_PATH"
   fi
 else
   # PC
-  export LD_LIBRARY_PATH="$DIR/../../phonelibs/snpe/x86_64-linux-clang:$DIR/../../openpilot/phonelibs/snpe/x86_64:$LD_LIBRARY_PATH"
+  export LD_LIBRARY_PATH="$DIR/../../third_party/snpe/x86_64-linux-clang:$DIR/../../openpilot/third_party/snpe/x86_64:$LD_LIBRARY_PATH"
 fi
 exec ./_modeld

selfdrive/modeld/test/snpe_benchmark/benchmark.sh

@@ -1,4 +1,4 @@
 #!/bin/sh -e
-clang++ -I /data/openpilot/phonelibs/snpe/include/ -L/data/pythonpath/phonelibs/snpe/aarch64 -lSNPE benchmark.cc -o benchmark
-export LD_LIBRARY_PATH="/data/pythonpath/phonelibs/snpe/aarch64/:$HOME/openpilot/phonelibs/snpe/x86_64/:$LD_LIBRARY_PATH"
+clang++ -I /data/openpilot/third_party/snpe/include/ -L/data/pythonpath/third_party/snpe/aarch64 -lSNPE benchmark.cc -o benchmark
+export LD_LIBRARY_PATH="/data/pythonpath/third_party/snpe/aarch64/:$HOME/openpilot/third_party/snpe/x86_64/:$LD_LIBRARY_PATH"
 exec ./benchmark $1

selfdrive/modeld/visiontest.mk

@@ -10,7 +10,7 @@ ifeq ($(UNAME_S),Darwin)
 	SHARED_FLAGS=-Wl,-force_load $^
 endif
 
-PHONELIBS := ../../phonelibs
+PHONELIBS := ../../third_party
 BASEDIR := ../..
 
 WARN_FLAGS = -Werror=implicit-function-declaration \

selfdrive/ui/SConscript

@@ -11,7 +11,7 @@ if arch == 'aarch64':
   base_libs += ['log', 'utils', 'gui', 'ui', 'CB', 'gsl', 'adreno_utils', 'cutils', 'uuid']
 
 if maps and arch == 'x86_64':
-  rpath = [Dir(f"#phonelibs/mapbox-gl-native-qt/{arch}").srcnode().abspath]
+  rpath = [Dir(f"#third_party/mapbox-gl-native-qt/{arch}").srcnode().abspath]
   qt_env["RPATH"] += rpath
 
 if arch == "Darwin":
@@ -21,7 +21,7 @@ if arch == "Darwin":
 widgets_src = ["qt/util.cc", "qt/widgets/input.cc", "qt/widgets/drive_stats.cc",
                "qt/widgets/ssh_keys.cc", "qt/widgets/toggle.cc", "qt/widgets/controls.cc",
                "qt/widgets/offroad_alerts.cc", "qt/widgets/prime.cc", "qt/widgets/keyboard.cc",
-               "qt/widgets/scrollview.cc", "qt/widgets/cameraview.cc", "#phonelibs/qrcode/QrCode.cc", "qt/api.cc",
+               "qt/widgets/scrollview.cc", "qt/widgets/cameraview.cc", "#third_party/qrcode/QrCode.cc", "qt/api.cc",
                "qt/request_repeater.cc"]
 
 if arch != 'aarch64':
@@ -54,7 +54,7 @@ qt_env.Program("qt/spinner", ["qt/spinner.cc"], LIBS=qt_libs)
 qt_src = ["main.cc", "ui.cc", "paint.cc", "qt/sidebar.cc", "qt/onroad.cc",
           "qt/window.cc", "qt/home.cc", "qt/offroad/settings.cc",
           "qt/offroad/onboarding.cc", "qt/offroad/driverview.cc",
-          "#phonelibs/nanovg/nanovg.c"]
+          "#third_party/nanovg/nanovg.c"]
 qt_env.Program("_ui", qt_src + [asset_obj], LIBS=qt_libs)
 
 

selfdrive/ui/ui

@@ -1,5 +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)"
+export QT_PLUGIN_PATH="../../third_party/qt-plugins/$(uname -m)"
 exec ./_ui