mirror of
https://github.com/zeromq/libzmq.git
synced 2024-12-27 15:41:05 +08:00
Merge pull request #4452 from stephan57160/master
Problem: Android helpers have duplicate init code.
This commit is contained in:
commit
8d4f4efef0
@ -500,19 +500,6 @@ fi
|
|||||||
# (Empty string indicates no failure)
|
# (Empty string indicates no failure)
|
||||||
ANDROID_BUILD_FAIL=()
|
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
|
# Sanity checks
|
||||||
########################################################################
|
########################################################################
|
||||||
|
Loading…
x
Reference in New Issue
Block a user