lumberyard-employee-dm
f09055af42
* Fixed CMake use with Android NDK 23 This was done by only setting the `ANDROID_ARM_MODE` if the ANDROID_ABI starts with `armeabi`. The Android arm mode setting can't be used using non-`armeabi` ABIs. In O3DE we default to `arm64-v8a` `ANDROID_ABI` So `ANDROID_ARM_MODE` must not be set. The CMake [Android-Determine.cmake](https://gitlab.kitware.com/cmake/cmake/-/blob/master/Modules/Platform/Android-Determine.cmake#L573-585) which is used to detect platform-wide information when the CMAKE_SYSTEM_NAME is set to android, enforces that if the `CMAKE_ANDROID_ARCH_ABI` doesn't start with `armeabi`, then it will fatal error if the CMAKE_ANDROID_ARM_MODE option is set. In Android NDK 21 the `ANDROID_ARM_MODE` variable is used to set the CMAKE_ANDROID_ARM_MODE variable if the [ANDROID_ABI](https://android.googlesource.com/platform/ndk/+/refs/tags/ndk-r21e/build/cmake/android.toolchain.cmake#700) starts with `armeabi`. This meant when using Android NDK 21, the CMake Android-Determine.cmake module would succeed, due to the CMAKE_ANDROID_ARM_MODE not being set. In Android NDK 23 the `ANDROID_ARM_MODE` now will set the `CMAKE_ANDROID_ARM_MODE` variable to `TRUE` if it isn't defined. Added an `--extra-cmake-configure-args` option to the `generate_android_project.py` script which can be used to append user specified CMake arguments to the cmake configure step (`cmake -B <build-dir> -S <source-dir> -DCMAKE_TOOLCHAIN_FILE=<android-toolchain-file> <extra-args>`) Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Updated the O3DE Android toolchain wrapper to fatal error if the 64-bit arm ABI isn't used. Also removed the unneccessary setting of the ANDROID_ARM_MODE and ANDROID_ARM_NEON option option now that the armeabi cannot be specified as an ABI. Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
156 lines
5.1 KiB
JSON
156 lines
5.1 KiB
JSON
{
|
|
"clean": {
|
|
"TAGS": [],
|
|
"COMMAND": "../Windows/clean_windows.cmd",
|
|
"PARAMETERS": {
|
|
"OUTPUT_DIRECTORY": "build",
|
|
"CMAKE_LY_PROJECTS": "AutomatedTesting"
|
|
}
|
|
},
|
|
"profile_pipe": {
|
|
"TAGS": [
|
|
"default"
|
|
],
|
|
"steps": [
|
|
"profile"
|
|
]
|
|
},
|
|
"metrics": {
|
|
"TAGS":[
|
|
"weekly"
|
|
],
|
|
"COMMAND":"../Windows/python_windows.cmd",
|
|
"PARAMETERS": {
|
|
"SCRIPT_PATH":"scripts/build/ci_build_metrics.py",
|
|
"SCRIPT_PARAMETERS":"--platform=Android --repository=!REPOSITORY_NAME! --jobname=!JOB_NAME! --jobnumber=!BUILD_NUMBER! --jobnode=!NODE_LABEL! --changelist=!CHANGE_ID!"
|
|
}
|
|
},
|
|
"debug": {
|
|
"TAGS":[
|
|
"nightly-incremental",
|
|
"nightly-clean",
|
|
"weekly-build-metrics"
|
|
],
|
|
"COMMAND":"../Windows/build_ninja_windows.cmd",
|
|
"PARAMETERS": {
|
|
"CONFIGURATION":"debug",
|
|
"OUTPUT_DIRECTORY":"build\\android",
|
|
"CMAKE_OPTIONS":"-G \"Ninja Multi-Config\" -DCMAKE_TOOLCHAIN_FILE=cmake\\Platform\\Android\\Toolchain_android.cmake -DANDROID_NATIVE_API_LEVEL=21 -DLY_NDK_DIR=\"!LY_NDK_DIR!\"",
|
|
"CMAKE_LY_PROJECTS":"AutomatedTesting",
|
|
"CMAKE_TARGET":"all",
|
|
"CMAKE_BUILD_ARGS":"-j!NUMBER_OF_PROCESSORS!"
|
|
}
|
|
},
|
|
"profile": {
|
|
"TAGS":[
|
|
"weekly-build-metrics",
|
|
"daily-pipeline-metrics"
|
|
],
|
|
"COMMAND":"../Windows/build_ninja_windows.cmd",
|
|
"PARAMETERS": {
|
|
"CONFIGURATION":"profile",
|
|
"OUTPUT_DIRECTORY":"build\\android",
|
|
"CMAKE_OPTIONS":"-G \"Ninja Multi-Config\" -DCMAKE_TOOLCHAIN_FILE=cmake\\Platform\\Android\\Toolchain_android.cmake -DANDROID_NATIVE_API_LEVEL=21 -DLY_NDK_DIR=\"!LY_NDK_DIR!\"",
|
|
"CMAKE_LY_PROJECTS":"AutomatedTesting",
|
|
"CMAKE_TARGET":"all",
|
|
"CMAKE_BUILD_ARGS":"-j!NUMBER_OF_PROCESSORS!"
|
|
}
|
|
},
|
|
"profile_nounity": {
|
|
"TAGS":[
|
|
"nightly-incremental",
|
|
"nightly-clean",
|
|
"weekly-build-metrics"
|
|
],
|
|
"COMMAND":"../Windows/build_ninja_windows.cmd",
|
|
"PARAMETERS": {
|
|
"CONFIGURATION":"profile",
|
|
"OUTPUT_DIRECTORY":"build\\android",
|
|
"CMAKE_OPTIONS":"-G \"Ninja Multi-Config\" -DCMAKE_TOOLCHAIN_FILE=cmake\\Platform\\Android\\Toolchain_android.cmake -DANDROID_NATIVE_API_LEVEL=21 -DLY_NDK_DIR=\"!LY_NDK_DIR!\" -DLY_UNITY_BUILD=FALSE",
|
|
"CMAKE_LY_PROJECTS":"AutomatedTesting",
|
|
"CMAKE_TARGET":"all",
|
|
"CMAKE_BUILD_ARGS":"-j!NUMBER_OF_PROCESSORS!"
|
|
}
|
|
},
|
|
"asset_profile": {
|
|
"TAGS":[
|
|
"default",
|
|
"weekly-build-metrics",
|
|
"nightly-incremental",
|
|
"nightly-clean"
|
|
],
|
|
"COMMAND":"../Windows/build_asset_windows.cmd",
|
|
"PARAMETERS": {
|
|
"CONFIGURATION":"profile",
|
|
"OUTPUT_DIRECTORY":"build\\windows",
|
|
"CMAKE_OPTIONS":"-G \"Visual Studio 16 2019\" -DCMAKE_SYSTEM_VERSION=10.0",
|
|
"CMAKE_LY_PROJECTS":"AutomatedTesting",
|
|
"CMAKE_TARGET":"AssetProcessorBatch",
|
|
"CMAKE_NATIVE_BUILD_ARGS": "/m /nologo",
|
|
"ASSET_PROCESSOR_BINARY": "bin\\profile\\AssetProcessorBatch.exe",
|
|
"ASSET_PROCESSOR_OPTIONS": "/zeroAnalysisMode --regset=\"/Amazon/AssetProcessor/Settings/Exclude Android/pattern=.*/DiffuseGlobalIllumination/.*precompiledshader\"",
|
|
"ASSET_PROCESSOR_PLATFORMS":"android"
|
|
}
|
|
},
|
|
"release": {
|
|
"TAGS":[
|
|
"nightly-incremental",
|
|
"nightly-clean",
|
|
"weekly-build-metrics"
|
|
],
|
|
"COMMAND":"../Windows/build_ninja_windows.cmd",
|
|
"PARAMETERS": {
|
|
"CONFIGURATION":"release",
|
|
"OUTPUT_DIRECTORY":"build\\android",
|
|
"CMAKE_OPTIONS":"-G \"Ninja Multi-Config\" -DCMAKE_TOOLCHAIN_FILE=cmake\\Platform\\Android\\Toolchain_android.cmake -DANDROID_NATIVE_API_LEVEL=21 -DLY_NDK_DIR=\"!LY_NDK_DIR!\"",
|
|
"CMAKE_LY_PROJECTS":"AutomatedTesting",
|
|
"CMAKE_TARGET":"all",
|
|
"CMAKE_BUILD_ARGS":"-j!NUMBER_OF_PROCESSORS!"
|
|
}
|
|
},
|
|
"monolithic_release": {
|
|
"TAGS":[
|
|
"nightly-incremental",
|
|
"nightly-clean",
|
|
"weekly-build-metrics"
|
|
],
|
|
"COMMAND":"../Windows/build_ninja_windows.cmd",
|
|
"PARAMETERS": {
|
|
"CONFIGURATION":"release",
|
|
"OUTPUT_DIRECTORY":"build\\mono_android",
|
|
"CMAKE_OPTIONS":"-G \"Ninja Multi-Config\" -DCMAKE_TOOLCHAIN_FILE=cmake\\Platform\\Android\\Toolchain_android.cmake -DANDROID_NATIVE_API_LEVEL=21 -DLY_NDK_DIR=\"!LY_NDK_DIR!\" -DLY_MONOLITHIC_GAME=TRUE",
|
|
"CMAKE_LY_PROJECTS":"AutomatedTesting",
|
|
"CMAKE_TARGET":"all",
|
|
"CMAKE_BUILD_ARGS":"-j!NUMBER_OF_PROCESSORS!"
|
|
}
|
|
},
|
|
"gradle": {
|
|
"TAGS":[
|
|
"default",
|
|
"weekly-build-metrics"
|
|
],
|
|
"COMMAND":"gradle_windows.cmd",
|
|
"PARAMETERS": {
|
|
"CONFIGURATION":"profile",
|
|
"OUTPUT_DIRECTORY":"build\\ad_grd",
|
|
"GAME_PROJECT": "AutomatedTesting",
|
|
"SIGN_APK": "false",
|
|
"GRADLE_BUILD_CMD": "build",
|
|
"ADDITIONAL_GENERATE_ARGS": ""
|
|
}
|
|
},
|
|
"periodic_test_profile": {
|
|
"TAGS":[
|
|
],
|
|
"COMMAND":"build_and_run_unit_tests.cmd",
|
|
"PARAMETERS": {
|
|
"CONFIGURATION":"profile",
|
|
"OUTPUT_DIRECTORY":"build\\android_unittest",
|
|
"GAME_PROJECT": "AutomatedTesting",
|
|
"SIGN_APK": "true",
|
|
"GRADLE_BUILD_CMD": "assemble",
|
|
"ADDITIONAL_GENERATE_ARGS": "--unit-test"
|
|
}
|
|
}
|
|
}
|