Skip to content

Commit e3749ed

Browse files
quning18fengqikai1414
authored andcommitted
apollo-platform: enhance build process for arm architecture
1. separate more thirdparty lib between x86 and arm 2. cleanup some unused files for arm version, we will install them on px2 directly
1 parent e2db26f commit e3749ed

File tree

685 files changed

+30360
-1
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

685 files changed

+30360
-1
lines changed

ros/build.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ MACHINE_ARCH="$(uname -m)"
1313

1414
INSTALL_PATH="${CURRENT_PATH}/install/ros_$MACHINE_ARCH"
1515
FASTRTPS_PATH="${CURRENT_PATH}/third_party/fast-rtps"
16+
TP_LIB_PATH="${CURRENT_PATH}/third_party/lib"
1617

1718
BUILD_TYPE="Release"
1819
export LD_LIBRARY_PATH="${CURRENT_PATH}/third_party/fast-rtps/lib:$LD_LIBRARY_PATH"
@@ -66,8 +67,9 @@ function clean() {
6667

6768
function build_ros() {
6869

69-
rm -f ${FASTRTPS_PATH}
70+
rm -f ${FASTRTPS_PATH} ${TP_LIB_PATH}
7071
ln -sf ${FASTRTPS_PATH}_${MACHINE_ARCH} ${FASTRTPS_PATH} &&
72+
ln -sf ${TP_LIB_PATH}_${MACHINE_ARCH} ${TP_LIB_PATH} &&
7173

7274
./catkin/bin/catkin_make_isolated --install --source . \
7375
--install-space ${INSTALL_PATH} -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \

ros/third_party/lib

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/home/nvidia/apollo-platform/ros/third_party/lib_aarch64
207 KB
Binary file not shown.
139 KB
Binary file not shown.
13.7 KB
Binary file not shown.

ros/third_party/lib/python2.7/dist-packages/catkin_pkg/__init__.py renamed to ros/third_party/lib_aarch64/python2.7/dist-packages/catkin_pkg/__init__.py

File renamed without changes.

ros/third_party/lib/python2.7/dist-packages/catkin_pkg/changelog.py renamed to ros/third_party/lib_aarch64/python2.7/dist-packages/catkin_pkg/changelog.py

File renamed without changes.

ros/third_party/lib/python2.7/dist-packages/catkin_pkg/changelog_generator.py renamed to ros/third_party/lib_aarch64/python2.7/dist-packages/catkin_pkg/changelog_generator.py

File renamed without changes.

ros/third_party/lib/python2.7/dist-packages/catkin_pkg/changelog_generator_vcs.py renamed to ros/third_party/lib_aarch64/python2.7/dist-packages/catkin_pkg/changelog_generator_vcs.py

File renamed without changes.

ros/third_party/lib/python2.7/dist-packages/catkin_pkg/cmake.py renamed to ros/third_party/lib_aarch64/python2.7/dist-packages/catkin_pkg/cmake.py

File renamed without changes.

0 commit comments

Comments
 (0)