Skip to content

Commit a450755

Browse files
committed
Update OpenSSL to 1.1.1w for Android
1 parent daa51bd commit a450755

File tree

3 files changed

+2
-2
lines changed

3 files changed

+2
-2
lines changed

tools/install-deps-cross-armhf.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ if ! ${USE_CACHE} || [ ! -d /usr/local/arm-linux-gnueabihf ] || [ ! -d ${NATIVE_
297297
vcs import --input https://raw.githubusercontent.com/ros2/ros2/release-galactic-20221209/ros2.repos src
298298
rosdep init
299299
rosdep update
300-
git apply ${SCRIPT_DIR}/ros2_fix_cross_compile.patch
300+
git apply ${SCRIPT_DIR}/patches/ros2_fix_cross_compile.patch
301301
# Without setting PythonExtra_EXTENSION_SUFFIX the .so file are armhf but have x86_64 in the name
302302
colcon build \
303303
--merge-install \

tools/install-deps-versions.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ export VERSION_ANDROID_SDK="33"
1818
export VERSION_ANDROID_BUILD_TOOLS="30.0.3"
1919
export VERSION_CMAKE="3.22.1" # Provided by Ubuntu 20.04, version here used for Android build
2020
export VERSION_SNAPPY="1.1.8" # Provided by Ubuntu 20.04, version here used for Android build
21-
export VERSION_OPENSSL="1.1.1s" # Provided by Ubuntu 20.04, version here used for Android build
21+
export VERSION_OPENSSL="1.1.1w" # Provided by Ubuntu 20.04, version here used for Android build
2222
export VERSION_BOOST="1.78.0" # Provided by Ubuntu 20.04, version here used for Android build
2323
export VERSION_ION_C="v1.1.2"

0 commit comments

Comments
 (0)