From 6d9c0b836671a8dbd541c8c447adca8bdb0a04cf Mon Sep 17 00:00:00 2001 From: "Guilloux Stephan (Ubuntu)" Date: Thu, 27 Oct 2022 15:25:41 +0200 Subject: [PATCH] Problem: Android helpers have duplicate init code. Last PRs introduced a duplicate code in Android helper file. Duplicate "Initialisation" sequence can be observed after the helper functions: ######################################################################## # Initialization ... # (Empty string indicates no failure) ANDROID_BUILD_FAIL=() Seen when trying to report last LIBZMQ Android PRs to CZMQ & ZYRE. Solution: Remove the duplicate code. --- builds/android/android_build_helper.sh | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/builds/android/android_build_helper.sh b/builds/android/android_build_helper.sh index 7867782d..272c3598 100644 --- a/builds/android/android_build_helper.sh +++ b/builds/android/android_build_helper.sh @@ -500,19 +500,6 @@ fi # (Empty string indicates no failure) ANDROID_BUILD_FAIL=() -######################################################################## -# Initialization -######################################################################## -# Get directory of current script (if not already set) -# This directory is also the basis for the build directories the get created. -if [ -z "$ANDROID_BUILD_DIR" ]; then - ANDROID_BUILD_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -fi - -# Set up a variable to hold the global failure reasons, separated by newlines -# (Empty string indicates no failure) -ANDROID_BUILD_FAIL=() - ######################################################################## # Sanity checks ########################################################################