From 871f7a05db4b152387c563be519cf3426a9b249e Mon Sep 17 00:00:00 2001
From: Alexey Edelev <alexey.edelev@qt.io>
Date: Wed, 1 Feb 2023 17:53:58 +0000
Subject: Revert "Revert "Add support for MultiABI with custom install dir of
 the android-build""

This reverts commit d7e8d5bb1b5a9c4b21a3d824780c672eaf4e56b1.

Reason for revert: Found a working solution for the issue.

Change-Id: Ia720cc63ece9dfb1a24067cdd9c3d79d4edbe3be
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
---
 src/android/java/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/android/java')

diff --git a/src/android/java/CMakeLists.txt b/src/android/java/CMakeLists.txt
index 8f0c0da542..598e374a03 100644
--- a/src/android/java/CMakeLists.txt
+++ b/src/android/java/CMakeLists.txt
@@ -48,7 +48,7 @@ add_custom_target(Qt${QtBase_VERSION_MAJOR}AndroidBindings
         ${strings_resouces}
 )
 
-qt_path_join(destination ${QT_INSTALL_DIR} "src/android/java")
+qt_path_join(destination ${QT_INSTALL_DIR} ${INSTALL_DATADIR} "src/android/java")
 
 qt_copy_or_install(DIRECTORY ${resource_directories}
                    DESTINATION "${destination}"
-- 
cgit v1.2.3