Skip to content
This repository was archived by the owner on Aug 31, 2021. It is now read-only.

Commit 747e893

Browse files
peter-bpeter-b
committed
Merge pull request #2520 from peter-b/build-nojvmcheck
build: Only check Android-only tools if configuring for Android
2 parents 3841852 + fff543c commit 747e893

File tree

1 file changed

+73
-81
lines changed

1 file changed

+73
-81
lines changed

‎config.sh‎

Lines changed: 73 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -264,87 +264,79 @@ fi
264264
WIN_PERL=${WIN_PERL:-"C:/perl/bin/perl.exe"}
265265

266266
# Android default settings and tools
267-
ANDROID_NDK_VERSION=${ANDROID_NDK_VERSION:-r10d}
268-
ANDROID_PLATFORM=${ANDROID_PLATFORM:-android-8}
269-
270-
# Attempt to locate an Android NDK
271-
if [ -z "${ANDROID_NDK}" ] ; then
272-
# Try the symlink we suggest in INSTALL-android.md
273-
if [ -d "${HOME}/android/toolchain/android-ndk" ] ; then
274-
ANDROID_NDK="${HOME}/android/toolchain/android-ndk"
275-
else
276-
if [ "${OS}" = "android" ] ; then
277-
echo >&2 "Error: Android NDK not found (set \$ANDROID_NDK)"
278-
exit 1
279-
fi
280-
fi
281-
fi
282-
283-
# Attempt to locate an Android SDK
284-
if [ -z "${ANDROID_SDK}" ] ; then
285-
# Try the symlink we suggest in INSTALL-android.md
286-
if [ -d "${HOME}/android/toolchain/android-sdk" ] ; then
287-
ANDROID_SDK="${HOME}/android/toolchain/android-sdk"
288-
else
289-
if [ "${OS}" = "android" ] ; then
290-
echo >&2 "Error: Android SDK not found (set \$ANDROID_SDK)"
291-
exit 1
292-
fi
293-
fi
294-
fi
295-
296-
# Attempt to guess the Android build tools version
297-
if [ -z "${ANDROID_BUILD_TOOLS}" ] ; then
298-
# Check for a sub-folder in the appropriate place
299-
# Possibly fragile - are there ever multiple sub-folders?
300-
if [ ! "$(echo \"${ANDROID_SDK}/build-tools/\"*)" = "${ANDROID_SDK}/build-tools/*" ] ; then
301-
ANDROID_BUILD_TOOLS=$(basename $(echo "${ANDROID_SDK}/build-tools/"*))
302-
else
303-
if [ "${OS}" = "android" ] ; then
304-
echo >&2 "Error: Android build tools not found (set \$ANDROID_BUILD_TOOLS)"
305-
exit 1
306-
fi
307-
fi
308-
fi
309-
310-
if [ -z "${ANDROID_TOOLCHAIN}" ] ; then
311-
# Try the folder we suggest in INSTALL-android.md
312-
if [ -d "${HOME}/android/toolchain/standalone" ] ; then
313-
ANDROID_TOOLCHAIN="${HOME}/android/toolchain/standalone/bin/arm-linux-androideabi-"
314-
else
315-
if [ "${OS}" = "android" ] ; then
316-
echo >&2 "Error: Android toolchain not found (set \$ANDROID_TOOLCHAIN)"
317-
exit 1
318-
fi
319-
fi
320-
fi
321-
322-
ANDROID_AR=${AR:-${ANDROID_TOOLCHAIN}ar}
323-
ANDROID_CC=${CC:-${ANDROID_TOOLCHAIN}clang -target arm-linux-androideabi -march=armv6 -integrated-as}
324-
ANDROID_CXX=${CXX:-${ANDROID_TOOLCHAIN}clang -target arm-linux-androideabi -march=armv6 -integrated-as}
325-
ANDROID_LINK=${LINK:-${ANDROID_TOOLCHAIN}clang -target arm-linux-androideabi -march=armv6 -integrated-as -fuse-ld=bfd}
326-
ANDROID_OBJCOPY=${OBJCOPY:-${ANDROID_TOOLCHAIN}objcopy}
327-
ANDROID_OBJDUMP=${OBJDUMP:-${ANDROID_TOOLCHAIN}objdump}
328-
ANDROID_STRIP=${STRIP:-${ANDROID_TOOLCHAIN}strip}
329-
330-
if [ -z "${JAVA_SDK}" ] ; then
331-
# Utility used to locate Java on OSX systems
332-
if [ -x /usr/libexec/java_home ] ; then
333-
ANDROID_JAVA_SDK="$(/usr/libexec/java_home)"
334-
elif [ -d /usr/lib/jvm/default ] ; then
335-
ANDROID_JAVA_SDK=/usr/lib/jvm/default
336-
elif [ -d /usr/lib/jvm/default-java ] ; then
337-
ANDROID_JAVA_SDK=/usr/lib/jvm/default-java
338-
else
339-
if [ "${OS}" = "android" ] ; then
340-
echo >&2 "Error: no Java SDK found - set \$JAVA_SDK"
341-
exit 1
342-
fi
343-
fi
344-
else
345-
ANDROID_JAVA_SDK="${JAVA_SDK}"
346-
fi
347-
267+
if test "${OS}" = "android" ; then
268+
ANDROID_NDK_VERSION=${ANDROID_NDK_VERSION:-r10d}
269+
ANDROID_PLATFORM=${ANDROID_PLATFORM:-android-8}
270+
271+
# Attempt to locate an Android NDK
272+
if [ -z "${ANDROID_NDK}" -a "${OS}" = "android" ] ; then
273+
# Try the symlink we suggest in INSTALL-android.md
274+
if [ -d "${HOME}/android/toolchain/android-ndk" ] ; then
275+
ANDROID_NDK="${HOME}/android/toolchain/android-ndk"
276+
else
277+
echo >&2 "Error: Android NDK not found (set \$ANDROID_NDK)"
278+
exit 1
279+
fi
280+
fi
281+
282+
# Attempt to locate an Android SDK
283+
if [ -z "${ANDROID_SDK}" ] ; then
284+
# Try the symlink we suggest in INSTALL-android.md
285+
if [ -d "${HOME}/android/toolchain/android-sdk" ] ; then
286+
ANDROID_SDK="${HOME}/android/toolchain/android-sdk"
287+
else
288+
echo >&2 "Error: Android SDK not found (set \$ANDROID_SDK)"
289+
exit 1
290+
fi
291+
fi
292+
293+
# Attempt to guess the Android build tools version
294+
if [ -z "${ANDROID_BUILD_TOOLS}" ] ; then
295+
# Check for a sub-folder in the appropriate place
296+
# Possibly fragile - are there ever multiple sub-folders?
297+
if [ ! "$(echo \"${ANDROID_SDK}/build-tools/\"*)" = "${ANDROID_SDK}/build-tools/*" ] ; then
298+
ANDROID_BUILD_TOOLS=$(basename $(echo "${ANDROID_SDK}/build-tools/"*))
299+
else
300+
echo >&2 "Error: Android build tools not found (set \$ANDROID_BUILD_TOOLS)"
301+
exit 1
302+
fi
303+
fi
304+
305+
if [ -z "${ANDROID_TOOLCHAIN}" ] ; then
306+
# Try the folder we suggest in INSTALL-android.md
307+
if [ -d "${HOME}/android/toolchain/standalone" ] ; then
308+
ANDROID_TOOLCHAIN="${HOME}/android/toolchain/standalone/bin/arm-linux-androideabi-"
309+
else
310+
echo >&2 "Error: Android toolchain not found (set \$ANDROID_TOOLCHAIN)"
311+
exit 1
312+
fi
313+
fi
314+
315+
ANDROID_AR=${AR:-${ANDROID_TOOLCHAIN}ar}
316+
ANDROID_CC=${CC:-${ANDROID_TOOLCHAIN}clang -target arm-linux-androideabi -march=armv6 -integrated-as}
317+
ANDROID_CXX=${CXX:-${ANDROID_TOOLCHAIN}clang -target arm-linux-androideabi -march=armv6 -integrated-as}
318+
ANDROID_LINK=${LINK:-${ANDROID_TOOLCHAIN}clang -target arm-linux-androideabi -march=armv6 -integrated-as -fuse-ld=bfd}
319+
ANDROID_OBJCOPY=${OBJCOPY:-${ANDROID_TOOLCHAIN}objcopy}
320+
ANDROID_OBJDUMP=${OBJDUMP:-${ANDROID_TOOLCHAIN}objdump}
321+
ANDROID_STRIP=${STRIP:-${ANDROID_TOOLCHAIN}strip}
322+
323+
if [ -z "${JAVA_SDK}" ] ; then
324+
# Utility used to locate Java on OSX systems
325+
if [ -x /usr/libexec/java_home ] ; then
326+
ANDROID_JAVA_SDK="$(/usr/libexec/java_home)"
327+
elif [ -d /usr/lib/jvm/default ] ; then
328+
ANDROID_JAVA_SDK=/usr/lib/jvm/default
329+
elif [ -d /usr/lib/jvm/default-java ] ; then
330+
ANDROID_JAVA_SDK=/usr/lib/jvm/default-java
331+
else
332+
echo >&2 "Error: no Java SDK found - set \$JAVA_SDK"
333+
exit 1
334+
fi
335+
else
336+
ANDROID_JAVA_SDK="${JAVA_SDK}"
337+
fi
338+
339+
fi # End of Android defaults & tools
348340

349341
################################################################
350342
# Invoke gyp

0 commit comments

Comments
 (0)