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

[android_compat_fixes] fixed issue with Gradle task chaining for some custom copy tasks

Browse Source 
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
This commit is contained in:
AMZN-ScottR
2021-11-02 13:05:54 -07:00
parent 255bf7cfba
commit ea52fc93ef
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/Tools/Platform/Android/android_support.py
+2 -2
View File
@@ -358,7 +358,7 @@ CUSTOM_GRADLE_COPY_NATIVE_CONFIG_FORMAT_STR = """
into 'outputs/native-lib/{abi}'
}}
compile{config}Sources.dependsOn copyNativeLibs{config}
merge{config}JniLibFolders.dependsOn copyNativeLibs{config}
copyNativeLibs{config}.mustRunAfter {{
tasks.findAll {{ task->task.name.contains('externalNativeBuild{config}') }}
@@ -388,7 +388,7 @@ CUSTOM_GRADLE_COPY_REGISTRY_FOLDER_FORMAT_STR = """
include ('*.setreg')
}}
compile{config}Sources.dependsOn copyRegistryFolder{config}
merge{config}Assets.dependsOn copyRegistryFolder{config}
"""
CUSTOM_GRADLE_COPY_REGISTRY_FOLDER_DEPENDENCY_FORMAT_STR = """