Update OpenSSL to 1.1.1w for Android

aws · Jan 22, 2024 · d0e9e51 · d0e9e51
1 parent daa51bd
commit d0e9e51
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/tools/install-deps-cross-armhf.sh b/tools/install-deps-cross-armhf.sh
@@ -297,7 +297,7 @@ if ! ${USE_CACHE} || [ ! -d /usr/local/arm-linux-gnueabihf ] || [ ! -d ${NATIVE_
         vcs import --input https://raw.githubusercontent.com/ros2/ros2/release-galactic-20221209/ros2.repos src
         rosdep init
         rosdep update
-        git apply ${SCRIPT_DIR}/ros2_fix_cross_compile.patch
+        git apply ${SCRIPT_DIR}/patches/ros2_fix_cross_compile.patch
         # Without setting PythonExtra_EXTENSION_SUFFIX the .so file are armhf but have x86_64 in the name
         colcon build \
             --merge-install \

diff --git a/tools/install-deps-versions.sh b/tools/install-deps-versions.sh
@@ -18,6 +18,6 @@ export VERSION_ANDROID_SDK="33"
 export VERSION_ANDROID_BUILD_TOOLS="30.0.3"
 export VERSION_CMAKE="3.22.1" # Provided by Ubuntu 20.04, version here used for Android build
 export VERSION_SNAPPY="1.1.8" # Provided by Ubuntu 20.04, version here used for Android build
-export VERSION_OPENSSL="1.1.1s" # Provided by Ubuntu 20.04, version here used for Android build
+export VERSION_OPENSSL="1.1.1w" # Provided by Ubuntu 20.04, version here used for Android build
 export VERSION_BOOST="1.78.0" # Provided by Ubuntu 20.04, version here used for Android build
 export VERSION_ION_C="v1.1.2"
diff --git a/tools/ros2_fix_cross_compile.patch → tools/patches/ros2_fix_cross_compile.patch b/tools/ros2_fix_cross_compile.patch → tools/patches/ros2_fix_cross_compile.patch