You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
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> |
4 years ago | |
|---|---|---|
| .. | ||
| 3rdParty | 4 years ago | |
| Packaging | 4 years ago | |
| Platform | 4 years ago | |
| TestImpactFramework | 4 years ago | |
| Tools | 4 years ago | |
| install | 4 years ago | |
| 3rdParty.cmake | 4 years ago | |
| 3rdPartyPackages.cmake | 4 years ago | |
| AzAutoGen.py | 4 years ago | |
| CMakeFiles.cmake | 4 years ago | |
| CommandExecution.cmake | 4 years ago | |
| CompilerSettings.cmake | 4 years ago | |
| ConfigurationTypes.cmake | 4 years ago | |
| Configurations.cmake | 4 years ago | |
| Dependencies.cmake | 4 years ago | |
| Deployment.cmake | 4 years ago | |
| FileUtil.cmake | 4 years ago | |
| Findo3de.cmake | 4 years ago | |
| Gems.cmake | 4 years ago | |
| GeneralSettings.cmake | 4 years ago | |
| Install.cmake | 4 years ago | |
| LYPackage_S3Downloader.cmake | 4 years ago | |
| LYPython.cmake | 4 years ago | |
| LYTestWrappers.cmake | 4 years ago | |
| LYWrappers.cmake | 4 years ago | |
| LyAutoGen.cmake | 4 years ago | |
| LySet.cmake | 4 years ago | |
| Monolithic.cmake | 4 years ago | |
| O3DEJson.cmake | 4 years ago | |
| OutputDirectory.cmake | 4 years ago | |
| PAL.cmake | 4 years ago | |
| PALTools.cmake | 4 years ago | |
| Packaging.cmake | 4 years ago | |
| PackagingConfig.cmake | 4 years ago | |
| Projects.cmake | 4 years ago | |
| RuntimeDependencies.cmake | 4 years ago | |
| SettingsRegistry.cmake | 4 years ago | |
| UnitTest.cmake | 4 years ago | |
| Version.cmake | 4 years ago | |
| __init__.py | 4 years ago | |
| cmake_files.cmake | 4 years ago | |
| createplatformfiles.py | 4 years ago | |
| gemcmake.py | 4 years ago | |
| mocfix.py | 4 years ago | |
| projectcmake.py | 4 years ago | |
| reroot.py | 4 years ago | |
| waffiles2cmake.py | 4 years ago | |
| warn_fix.py | 4 years ago | |