Integrating latest from github/staging

Integrating up through commit 5e1bdae
2021-03-26 14:31:50 -07:00
parent 9c54341af8
commit 36c4e827bd
764 changed files with 11453 additions and 20251 deletions
@@ -35,7 +35,7 @@ subprojects {
        sdkVer = ${SDK_VER}
        ndkPlatformVer = ${NDK_PLATFORM_VER}
        buildToolsVer = '${SDK_BUILD_TOOL_VER}'
-        lyDevRoot = '${LY_DEV_ROOT}'
+        lyEngineRoot = '${LY_ENGINE_ROOT}'
    }
 }