From a4498f9ce35a7c8d87d38bd609d42081a5fc7d4d Mon Sep 17 00:00:00 2001 From: Juan Ramos Date: Tue, 7 Nov 2023 12:04:14 -0700 Subject: Remove --tests from android.puy Barely makes sense for VVL. Makes no sense here to have here. --- BUILD.md | 4 ++-- scripts/android.py | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/BUILD.md b/BUILD.md index 32f2487d..12cdd279 100644 --- a/BUILD.md +++ b/BUILD.md @@ -284,10 +284,10 @@ This script handles wrapping CMake and various Android CLI tools to create the A ```sh # Build a complete APK with debug binaries for all ABIS -python3 scripts/android.py --config Debug --app-abi 'armeabi-v7a arm64-v8a x86 x86_64' --app-stl c++_shared --apk --tests +python3 scripts/android.py --config Debug --app-abi 'armeabi-v7a arm64-v8a x86 x86_64' --app-stl c++_shared --apk # Build a clean APK with release binaries for arm64-v8a -python3 scripts/android.py --config Release --app-abi arm64-v8a --app-stl c++_shared --apk --tests --clean +python3 scripts/android.py --config Release --app-abi arm64-v8a --app-stl c++_shared --apk --clean ``` Note: `scripts/android.py` will place the APK in the `build-android/bin` directory. diff --git a/scripts/android.py b/scripts/android.py index f976a2f5..20cc69d4 100755 --- a/scripts/android.py +++ b/scripts/android.py @@ -108,7 +108,6 @@ def main(): parser.add_argument('--app-abi', dest='android_abi', type=str, default="arm64-v8a") parser.add_argument('--app-stl', dest='android_stl', type=str, choices=["c++_static", "c++_shared"], default="c++_static") parser.add_argument('--apk', action='store_true', help='Generate an APK as a post build step.') - parser.add_argument('--tests', action='store_true', help='Build tests.') parser.add_argument('--clean', action='store_true', help='Cleans CMake build artifacts') args = parser.parse_args() @@ -116,7 +115,6 @@ def main(): android_abis = args.android_abi.split(" ") android_stl = args.android_stl create_apk = args.apk - build_tests = args.tests clean = args.clean if "ANDROID_NDK_HOME" not in os.environ: @@ -181,7 +179,6 @@ def main(): cmake_cmd += f' -D CMAKE_TOOLCHAIN_FILE={android_toolchain}' cmake_cmd += f' -D CMAKE_ANDROID_ARCH_ABI={abi}' cmake_cmd += f' -D CMAKE_INSTALL_LIBDIR={lib_dir}' - cmake_cmd += f' -D BUILD_TESTS={build_tests}' cmake_cmd += f' -D CMAKE_ANDROID_STL_TYPE={android_stl}' cmake_cmd += ' -D ANDROID_PLATFORM=26' -- cgit v1.2.3