Fix condition that adds resources for each Android ABI

If we already have the list of Android ABI in BUILDS, it's not
necessary to generate extra resource while Qt build.

Amends: 58556afb6960b442f88649b550aaec8e1a04338b

Fixes: QTBUG-88031
Change-Id: I344efe6c477461659a360281da59c4abeae18fc2
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 72d1393c1d88a70c337e87c661bbeefe46346d23)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Alexey Edelev 2021-04-01 14:42:18 +02:00 committed by Qt Cherry-pick Bot
parent 9823930482
commit 4f042c8262

View File

@ -35,12 +35,10 @@ defineTest(qtFlattenResources) {
}
RESOURCES -= $$resource
!android {
isEmpty(BUILDS)|build_pass {
resource_file = $$absolute_path($$RCC_DIR/qmake_$${resource}.qrc, $$OUT_PWD)
RESOURCES += $$resource_file
}
} else {
} else: android {
# Android will need a resource file for each architecture make sure it is placed
# correctly for other functions that need the right paths for these files
for (arch, ANDROID_ABIS) {