History

Merge "Fail early when android target does not include --sdk-path"

Johann Koenig committed 10 years ago

Commit 9eeb1f22 parents 424982b 31007381 file · +4 −0Browse files

Unified · Split

build/make/configure.sh+4−0
@@ -1015,6 +1015,10 @@ EOF · 1014 unmodified lines
1015 ;;1015 ;;
1016 1016
1017 android*)1017 android*)
1018 if [ -z "${sdk_path}" ]; then
1019 die "Must specify --sdk-path for Android builds."
1020 fi
1021
1018 SDK_PATH=${sdk_path}1022 SDK_PATH=${sdk_path}
1019 COMPILER_LOCATION=`find "${SDK_PATH}" \1023 COMPILER_LOCATION=`find "${SDK_PATH}" \
1020 -name "arm-linux-androideabi-gcc*" -print -quit`1024 -name "arm-linux-androideabi-gcc*" -print -quit`

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t