ANDROID: Rename APP_ABI to SYS_ANDROID_ABI for consistency

Author: mgorges

targets/android/build-binary

@@ -234,8 +234,8 @@ mkdir $tmpmoddir/libpayload
 cp loaders/android/Android.mk.module $tmpmoddir/libpayload/Android.mk
 
 # Loop over possible architectures and copy their precompiled files
-APP_ABIs=`echo $APP_ABIs | awk '{for (i=1;i<=NF;i++) if (!a[$i]++) printf("%s%s",$i,FS)}{printf("\n")}'`
-for abi in $APP_ABIs; do
+SYS_ANDROID_ABIs=`echo $SYS_ANDROID_ABIs | awk '{for (i=1;i<=NF;i++) if (!a[$i]++) printf("%s%s",$i,FS)}{printf("\n")}'`
+for abi in $SYS_ANDROID_ABIs; do
   case "$abi" in
   armeabi-v7a)
     arch=arm
@@ -266,10 +266,10 @@ cd $tmpdir
 
 if [ $SYS_MODE = "debug" ]; then
   echo " => compiling payload module with debug options.."
-  veval "NDK_MODULE_PATH=$tmpmoddir $ANDROIDNDK/ndk-build APP_ABI=\"$APP_ABIs\" NDK_LOG=1 NDK_DEBUG=1"
+  veval "NDK_MODULE_PATH=$tmpmoddir $ANDROIDNDK/ndk-build APP_ABI=\"$SYS_ANDROID_ABIs\" NDK_LOG=1 NDK_DEBUG=1"
 else
   echo " => compiling payload module.."
-  veval "NDK_MODULE_PATH=$tmpmoddir $ANDROIDNDK/ndk-build --silent APP_ABI=\"$APP_ABIs\""
+  veval "NDK_MODULE_PATH=$tmpmoddir $ANDROIDNDK/ndk-build --silent APP_ABI=\"$SYS_ANDROID_ABIs\""
 fi
 asserterror $?
 
@@ -298,7 +298,7 @@ if [ `has_module hybridapp-xwalk` = yes ]; then
   if [ -d $SYS_PREFIX/lib/libxwalk ]; then
     rmifexists "$SYS_TMPDIR/libxwalk"
     cp -R -f $SYS_PREFIX/lib/libxwalk $SYS_TMPDIR/
-    if [ ! -d $SYS_TMPDIR/libxwalk/libs/armeabi ] && [ $APP_ABI = armeabi ]; then
+    if [ ! -d $SYS_TMPDIR/libxwalk/libs/armeabi ] && [ $SYS_ANDROID_ABI = armeabi ]; then
       mv $SYS_TMPDIR/libxwalk/libs/armeabi-v7a $SYS_TMPDIR/libxwalk/libs/armeabi
     fi
     xwalk_here=`pwd`

targets/android/host_linux_arm

@@ -1,5 +1,5 @@
 SYS_CPU=arm
 ANDROIDARCH=arm
-APP_ABI=armeabi-v7a
-APP_ABIs="$APP_ABIs $APP_ABI"
+SYS_ANDROID_ABI=armeabi-v7a
+SYS_ANDROID_ABIs="$SYS_ANDROID_ABIs $SYS_ANDROID_ABI"
 . $SYS_ROOT/targets/android/_host_linux

targets/android/host_linux_arm64

@@ -1,8 +1,8 @@
 if [ $SYS_ANDROIDAPI -ge 21 ]; then
   SYS_CPU=arm64
   ANDROIDARCH=arm64
-  APP_ABI=arm64-v8a
-  APP_ABIs="$APP_ABIs $APP_ABI"
+  SYS_ANDROID_ABI=arm64-v8a
+  SYS_ANDROID_ABIs="$SYS_ANDROID_ABIs $SYS_ANDROID_ABI"
 else
   vecho "WARNING: ARM64 requires a minimum API of 21 to build"
   . $SYS_ROOT/targets/android/host_linux_arm

targets/android/host_macosx_arm

@@ -1,5 +1,5 @@
 SYS_CPU=arm
 ANDROIDARCH=arm
-APP_ABI=armeabi-v7a
-APP_ABIs="$APP_ABIs $APP_ABI"
+SYS_ANDROID_ABI=armeabi-v7a
+SYS_ANDROID_ABIs="$SYS_ANDROID_ABIs $SYS_ANDROID_ABI"
 . $SYS_ROOT/targets/android/_host_macosx

targets/android/host_macosx_arm64

@@ -1,8 +1,8 @@
 if [ $SYS_ANDROIDAPI -ge 21 ]; then
   SYS_CPU=arm64
   ANDROIDARCH=arm64
-  APP_ABI=arm64-v8a
-  APP_ABIs="$APP_ABIs $APP_ABI"
+  SYS_ANDROID_ABI=arm64-v8a
+  SYS_ANDROID_ABIs="$SYS_ANDROID_ABIs $SYS_ANDROID_ABI"
   . $SYS_ROOT/targets/android/_host_macosx
 else
   vecho "WARNING: ARM64 requires a minimum API of 21 to build"