Rename android args to have underscore

Also added file I missed in the last commit.

Author: jcortell68

build/pre_build.py

@@ -33,9 +33,9 @@ def pre_build(build_args):
 
     build_dir_name = "cmake_bld"
 
-    if build_args.androidx64 == True:
+    if build_args.android_x64 == True:
         build_dir_name = "cmake_bld_android_x64"
-    elif build_args.androidarm64 == True:
+    elif build_args.android_arm64 == True:
         build_dir_name = "cmake_bld_android_arm64"
 
     cmake_additional_args = PreBuildCMakeCommon.parse_cmake_arguments(build_args)
@@ -45,7 +45,7 @@ def pre_build(build_args):
     else:
         cmake_additional_args.append("-Dbuild=0")
 
-    if build_args.androidx64 == True or build_args.androidarm64 == True:
+    if build_args.android_x64 == True or build_args.android_arm64 == True:
         PreBuildCMakeCommon.cmake_generator_platforms.remove('x86')
         android_ndk=os.environ["ANDROID_NDK"]
         if android_ndk == "":
@@ -60,9 +60,9 @@ def pre_build(build_args):
         cmake_additional_args.append("-Dskiptests=ON")
         cmake_additional_args.append("-Dbuild-32bit=OFF")
 
-    if build_args.androidx64 == True:
+    if build_args.android_x64 == True:
         cmake_additional_args.append("-DANDROID_ABI=x86_64")
-    elif build_args.androidarm64 == True:
+    elif build_args.android_arm64 == True:
         cmake_additional_args.append("-DANDROID_ABI=arm64-v8a")
 
     print(PreBuildCMakeCommon.cmake_generator)

scripts/pre_build_common.py

@@ -127,7 +127,9 @@ def define_cmake_arguments():
     script_parser.add_argument("--nofetch", action="store_true", help="skip fetching repo dependencies")
     script_parser.add_argument("--cmakecmd", type=str, default="cmake", help="command to use in place of 'cmake'")
     script_parser.add_argument("--verbose", action="store_true", help="Turns on the verbosity of the script'")
-    script_parser.add_argument("--android", action="store_true", help="CMake will generate project files for android")
+    script_parser.add_argument("--android_x64", action="store_true", help="CMake will generate project files for Android x64")
+    script_parser.add_argument("--android_arm64", action="store_true", help="CMake will generate project files for Android Arm-64")
+    script_parser.add_argument("--android", dest="android_x64", action="store_true", help="Same as --android_x64 (for backwards compatibility)")
 
     script_parser.add_argument("--clang_format", action="store_true", help="run clang-format on source files prior to performing a build")
     script_parser.add_argument("--clang_tidy", action="store_true", help="run clang-tidy on source files after a build completes")