birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reading 3rdparty from manifest if it exists (#5840)

Browse Source 
* Reading 3rdparty from manifest if it exists, removnig the need to pass it across the board, updated jenkins paths so 3rdparty is put into the workspace

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Removes unneded space

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Changes how we get the NDK folder

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* needs delayed expansion

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Ninja is in the path, is not needed for Android

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
This commit is contained in:
Esteban Papp
2021-11-22 14:21:02 -08:00
committed by GitHub
parent be2a32d68d
commit ccb5336843
16 changed files with 51 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/Platform/Android/Toolchain_android.cmake
+6 -2
View File
@@ -11,10 +11,14 @@ if(LY_TOOLCHAIN_NDK_API_LEVEL)
endif()
# Verify that the NDK environment is set and points to the support NDK
if(NOT ${LY_NDK_DIR})
if($ENV{LY_NDK_DIR})
set(LY_NDK_DIR $ENV{LY_NDK_DIR})
endif()
endif()
file(TO_CMAKE_PATH "${LY_NDK_DIR}" LY_NDK_DIR)
if(NOT LY_NDK_DIR)
message(FATAL_ERROR "Environment var for NDK is empty. Could not find the NDK installation folder")
message(FATAL_ERROR "Environment and cache var for NDK is empty. Could not find the NDK installation folder")
endif()
set(LY_ANDROID_NDK_TOOLCHAIN ${LY_NDK_DIR}/build/cmake/android.toolchain.cmake)