Skip to content

Commit

Permalink
[build,android] remove NDK_BUILD
Browse files Browse the repository at this point in the history
the old build system is no longer in use
  • Loading branch information
Armin Novak committed Jan 9, 2024
1 parent dc77226 commit a861a42
Showing 1 changed file with 1 addition and 13 deletions.
14 changes: 1 addition & 13 deletions scripts/android-build-common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -143,18 +143,6 @@ function common_check_requirements {
exit 1
fi

if [ -x $ANDROID_NDK/ndk-build ]; then
NDK_BUILD=$ANDROID_NDK/ndk-build
else
echo "ndk-build not found in NDK directory $ANDROID_NDK"
echo "assuming ndk-build is in path..."
NDK_BUILD=$(which ndk-build)
if [ -z $NDK_BUILD ]; then
echo "ndk-build not found in $ANDROID_NDK and not in PATH"
exit 1
fi
fi

if [ -z $CMAKE_PROGRAM ]; then
CMAKE_PROGRAM=$(find $ANDROID_SDK/cmake -name cmake $FIND_ARGS)
if [ -z $CMAKE_PROGRAM ]; then
Expand All @@ -164,7 +152,7 @@ function common_check_requirements {
CMAKE_PROGRAM=$(realpath "$ANDROID_SDK/cmake/${CMAKE_PRORGAM}")
fi

for CMD in make git $CMAKE_PROGRAM $NDK_BUILD
for CMD in make git $CMAKE_PROGRAM
do
if ! type $CMD >/dev/null; then
echo "Command $CMD not found. Install and add it to the PATH."
Expand Down

0 comments on commit a861a42

Please sign in to comment.