Coin: remove workarounds to allow running Android tests

We had two workarounds:
* script that adds Gui to tests
* create a symbolic link for the qt install dir to fake_prefix which
androiddelployqt was expecting them to be under

Both issues are fixed, thus removing the workarounds.

Change-Id: Ic022bece15afe92c693d573893d260b13b4227ed
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit bcbdbd50fefd90cc8cfe2c01d8f681dfe690971a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

4 files changed, 0 insertions, 60 deletions

diff --git a/cmake/QtWrapperScriptHelpers.cmake b/cmake/QtWrapperScriptHelpers.cmake
index 3f8fbca54f..15b0ca9eca 100644
--- a/cmake/QtWrapperScriptHelpers.cmake
+++ b/cmake/QtWrapperScriptHelpers.cmake
@@ -162,6 +162,4 @@ function(qt_internal_install_android_helper_scripts)
     qt_path_join(destination "${QT_INSTALL_DIR}" "${INSTALL_LIBEXECDIR}")
     qt_copy_or_install(PROGRAMS "${CMAKE_CURRENT_SOURCE_DIR}/util/android/android_emulator_launcher.sh"
                        DESTINATION "${destination}")
-    qt_copy_or_install(PROGRAMS "${CMAKE_CURRENT_SOURCE_DIR}/util/android/android_cmakelist_patcher.sh"
-                       DESTINATION "${destination}")
 endfunction()
diff --git a/coin/instructions/call_cmake_for_standalone_tests.yaml b/coin/instructions/call_cmake_for_standalone_tests.yaml
index cdbec9f107..7b78eee8c8 100644
--- a/coin/instructions/call_cmake_for_standalone_tests.yaml
+++ b/coin/instructions/call_cmake_for_standalone_tests.yaml
@@ -1,18 +1,6 @@
 type: Group
 instructions:
   - type: ChangeDirectory
-    directory: "{{.SourceDir}}"
-  - type: ExecuteCommand
-    command: "{{.InstallDir}}/libexec/android_cmakelist_patcher.sh"
-    maxTimeInSeconds: 6000
-    maxTimeBetweenOutput: 1200
-    userMessageOnFailure: >
-      Failed to patch CMakeLists.txt.
-    enable_if:
-      condition: property
-      property: features
-      contains_value: AndroidTestRun
-  - type: ChangeDirectory
     directory: "{{.BuildDir}}"
   - type: ExecuteCommand
     command: "{{.Env.TESTS_ENV_PREFIX}} {{.Env.INSTALL_DIR_FOR_CMAKE_TESTS}}\\bin\\qt-internal-configure-tests {{.Env.COIN_CMAKE_ARGS}}"
diff --git a/coin/instructions/cmake_regular_test_instructions_common.yaml b/coin/instructions/cmake_regular_test_instructions_common.yaml
index 3a9e75c576..ec6f23a3f7 100644
--- a/coin/instructions/cmake_regular_test_instructions_common.yaml
+++ b/coin/instructions/cmake_regular_test_instructions_common.yaml
@@ -11,13 +11,3 @@ instructions:
       Failed to install tests archive.
   - type: ChangeDirectory
     directory: "{{.SourceDir}}_standalone_tests"
-  - type: ExecuteCommand
-    command: "ln -s {{.InstallDir}}/target fake_prefix"
-    maxTimeInSeconds: 6000
-    maxTimeBetweenOutput: 1200
-    userMessageOnFailure: >
-      Failed to run android hack. See QTBUG-88579 to check if this can be removed
-    enable_if:
-      condition: property
-      property: features
-      contains_value: AndroidTestRun
diff --git a/util/android/android_cmakelist_patcher.sh b/util/android/android_cmakelist_patcher.sh
deleted file mode 100755
index 36888d8825..0000000000
--- a/util/android/android_cmakelist_patcher.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh
-#############################################################################
-##
-## Copyright (C) 2020 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the plugins of the Qt Toolkit.
-##
-## $QT_BEGIN_LICENSE:GPL-EXCEPT$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 3 as published by the Free Software
-## Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-# This util patches CMakeLists.txt files to enable running
-# autotest in Android emulator in Qt CI.
-
-tests_dir="$PWD/tests/auto"
-find ${tests_dir} -iname "CMakeLists.txt" -print0 |
-    while IFS= read -r -d '' file; do
-        sed -i '/qt_internal_add_test/a\    PUBLIC_LIBRARIES\n        Qt::Gui' $file
-    done