From a9c2bf98fc8fd68151dadfd6a9933e1d2d219ae3 Mon Sep 17 00:00:00 2001 From: ignaciogarcia Date: Thu, 27 Oct 2022 10:49:18 +0200 Subject: [PATCH] PEMA-107 Remove duplicate ANDROID_API variable --- android/external/MakefileTemplate | 1 - android/external/createMakefile.sh | 5 ----- 2 files changed, 6 deletions(-) diff --git a/android/external/MakefileTemplate b/android/external/MakefileTemplate index e882ec4..4e6bfc9 100644 --- a/android/external/MakefileTemplate +++ b/android/external/MakefileTemplate @@ -5,7 +5,6 @@ # Build parameters APP_ABI ?= [ARCH] -ANDROID_API ?= [ANDROID_API] HOST ?= [HOST] NDK_TOOLCHAIN_TARGET ?= [NDK_TOOLCHAIN_TARGET] SEQUOIA_ARCH ?= [SEQUOIA_ARCH] diff --git a/android/external/createMakefile.sh b/android/external/createMakefile.sh index ee95864..4bdc8f9 100644 --- a/android/external/createMakefile.sh +++ b/android/external/createMakefile.sh @@ -13,7 +13,6 @@ FILE_DEST=$ARCH_DEST/Makefile case $ARCH_DEST in x86) - ANDROID_API=18 HOST=i686-linux-android COMPILER_PREFIX="$HOST" NDK_TOOLCHAIN_TARGET="$ARCH_DEST" @@ -22,7 +21,6 @@ case $ARCH_DEST in SEQUOIA_ARCH=i686-linux-android ;; x86_64) - ANDROID_API=21 HOST=x86_64-linux-android COMPILER_PREFIX="$HOST" NDK_TOOLCHAIN_TARGET="$ARCH_DEST" @@ -31,7 +29,6 @@ case $ARCH_DEST in SEQUOIA_ARCH=x86_64-linux-android ;; armeabi-v7a) - ANDROID_API=18 HOST=arm-linux-androideabi COMPILER_PREFIX=armv7a-linux-androideabi NDK_TOOLCHAIN_TARGET="$HOST" @@ -40,7 +37,6 @@ case $ARCH_DEST in SEQUOIA_ARCH=armv7-linux-androideabi ;; arm64-v8a) - ANDROID_API=21 HOST=aarch64-linux-android COMPILER_PREFIX="$HOST" NDK_TOOLCHAIN_TARGET="$HOST" @@ -70,7 +66,6 @@ esac ################################################################################ $SED -i 's/\[ARCH\]/'"$ARCH_DEST"'/g' "$FILE_DEST" -$SED -i 's/\[ANDROID_API\]/'"$ANDROID_API"'/g' "$FILE_DEST" $SED -i 's/\[HOST\]/'"$HOST"'/g' "$FILE_DEST" $SED -i 's@\[COMPILER_PREFIX\]@'"$COMPILER_PREFIX"'@g' "$FILE_DEST" $SED -i 's@\[NDK_TOOLCHAIN_TARGET\]@'"$NDK_TOOLCHAIN_TARGET"'@g' "$FILE_DEST"