aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/blackbox/testdata-android
Commit message (Collapse)AuthorAgeFilesLines
* Qt/Android: Extend rule cycle prevention hackChristian Kandeler2021-01-262-1/+55
| | | | | | | | | | | After we did remove the hpp tag from the java-generated header, it was re-added by a file tagger in the cpp modules file, leading to an unexpected state on rebuilding. Fix this by replacing the tag, rather than removing it. Fixes: QBS-1628 Change-Id: I9d182cd30cf9a637733b84234e7a0b37f7583334 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* Disable moc for the aggregate product when multiplexingRaphaël Cotty2020-11-264-4/+31
| | | | | | | | | | | Running moc in the aggregate can't happen anymore because it generates an error when accessing cpp.defines. Before 527d5a8ec54e44291d4968754bdf574ebe57822b cpp.defines was not accessed for hpp files. Anyway it doesn't make sense to call moc in the aggregate as the generated files won't be compiled. Change-Id: I25ada3c8c54b199efb0877b59025fff88dc84dd8 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* Android: Change the product property to importingProduct to allow exporting ↵Raphaël Cotty2020-09-212-0/+28
| | | | | | | | | | | | | Qt module The product variable in the Export item refers to the exporting item. If a qbs property is changed (example: qbs.architecture for the multiplexing in Android) then the Depend failed because the qbs module was not loaded yet for the exporting item. Fixes: QBS-1576 Change-Id: I220c47b3094727fe169d3dccd244ab2785a782b7 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Android: Do not append the version number to a library nameChristian Kandeler2020-08-041-0/+1
| | | | | | | | Only the ".so" suffix is supported on Android. Fixes: QBS-1578 Change-Id: Idebece5338a765e779ff987fd89af66977ecc0fe Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* Android: Add support to generation of aab packageRaphaël Cotty2020-06-252-0/+2
| | | | | | | | | This patch adds the Android.sdk packageType property which sets the target application. By default (previous behavior) qbs generates an apk package. When set to aab, qbs generates instead an aab package Change-Id: Ic09776d08e2a2ecd68fb4c08881201a7a0a25240 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Add Docker environment to test Qbs with Qt for AndroidRaphaël Cotty2020-01-105-4/+5
| | | | | | | | | | | | | | | | | | | | | | The Docker images contains ndk r20 and qt 5.13.2 as well as 5.14.0. Containers can be started with the following command line: - docker-compose pull bionic-android-513 - docker-compose run --rm bionic-android-513 The current folder is mounted under /qbs. Assuming that Qbs has been built in the current directory and with release configuration, the autotests can be invoked with: docker-compose run --rm bionic-android-513 scripts/test-qt-for-android.sh \ release/install-root/usr/local/bin A job Travis CI job is added which builds Qt and runs the Android blackbox tests. Change-Id: I76b1901cb7c41f8b5b0122265c99c9b37b59f261 Reviewed-by: Richard Weickelt <richard@weickelt.de> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* [Android] Allow the user to override version attributesBogDan Vatra2019-04-241-0/+2
| | | | | | | | Allow the user to override the android::versionCode and android::versionName from QBS project file. Change-Id: I437294e8f6b52c1072bb1c992d1c7ac5233896c9 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Android: Check for valid package name upon package creationChristian Kandeler2019-02-273-0/+4
| | | | | | | | | That's nicer than letting users get a cryptic error message when they try to install their package on the device. Change-Id: Ie5321a28475f879f991c4440c7e64c1c3ebd5a9d Fixes: QBS-1428 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Android autotests: Add missing fileChristian Kandeler2018-12-071-0/+0
| | | | | | | Amends 4ebb16fa78. Change-Id: I32b8651cf64a28605a77f45226c6697400b1a2bb Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Properly support building Qt apps for AndroidChristian Kandeler2018-11-166-0/+130
| | | | | | | | ... via the androiddeployqt tool. Fixes: QBS-991 Change-Id: I4a3abe977fee6a9d1657a4fd6c1b43709429da9f Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Fix Android autotests without a dedicated profileChristian Kandeler2018-10-231-0/+1
| | | | | Change-Id: I95d21a41a7fdf879f45f59648ce1ba693d3a9c40 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Android: Enable building apps with native code and no multiplexingChristian Kandeler2018-10-194-0/+53
| | | | | | | | | | | Until now, we needed to either put the native part into its own product or use multiplexing with the "APK product" serving as the aggregate. Now it is also possible to use a single product without multiplexing, which is a more natural approach in the case where there is only one architecture. Change-Id: I976168c99f75ad8e4940ac61f957c64ad29f5f5c Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Merge 1.12 into masterChristian Kandeler2018-10-124-1/+10
|\ | | | | | | Change-Id: I96c735aeda89e02f1fa9107ecfc10ebf4b554dbc
| * Android support: Adapt to changes in newer revisionsChristian Kandeler2018-10-114-1/+8
| | | | | | | | | | | | | | | | Revision 17 dropped some architectures, revision 18 removed GCC. We also missed some earlier changes to clang-related paths. Change-Id: Ie2fa1891f7f4de28e18ea6caadce9eac964bb523 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | Android: Properly support the aidl toolChristian Kandeler2018-08-275-0/+50
| | | | | | | | | | | | | | | | We now pull in the AIDL framework file and let the user set search paths for imports. Change-Id: I93460a77b064fa87849b93c0b0e4bd3bbfd7459f Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Enable the Application item to create Android appsChristian Kandeler2018-08-105-30/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The formerly required AndroidApk item is no longer needed: We just tag the APK file as an application and let the Application item pull in the Android.sdk module for Android targets. It is also possible to have native code directly in the Application product; in that case, the multiplexed variants become dynamic libraries and the APK file is built for the aggregate. [ChangeLog] The AndroidApk item was deprecated, a normal Application item can be used instead. Change-Id: I04f5f3892f354ca9eb4f2da8055abcd8d072aba0 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | Remove the base module import from most test data projectsJoerg Bornemann2018-06-226-11/+0
|/ | | | | | | | Keep the base import in blackbox/testdata/deprecated-property to ensure we don't accidentally break it. Change-Id: I790da21a7490ec9c1b0335f45e8707e7e04daa7c Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Don't rely on a qbs-autotests_android profile for autotestsJake Petroules2017-11-294-0/+10
| | | | | | | | Instead, simply set the qbs.targetPlatform property for the relevant products. Change-Id: Ia39cf6d4f729783b0d7fb85a83023f438b9e3e20 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Only include one of gl3stub.cpp or gl3stub.c in the Android teapot testJake Petroules2017-11-131-1/+2
| | | | | | | | | The .c file was renamed to .cpp at some point, but both copies remain in the samples repository. Listing both will result in duplicate gl3stubInit symbols during linking. Change-Id: Ifb9bbbdb9b955bc3811aa5d0bb5ce722bf6c3565 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Fix Android teapot exampleJake Petroules2017-09-011-3/+26
| | | | | | | | | | | | | | The latest version of the example in ndk-samples *requires* C++11, so we switch to gnustl. We also ensure that ANativeActivity_onCreate is exported, otherwise it'll be optimized away. The official CMake code in ndk-samples uses this same workaround. The ndk_helper directory in the Android NDK is deprecated, so we use the one from ndk-samples if we find it. This should be backwards compatible with older versions of the sample. Change-Id: I6929a67874a8eea33d38e79bbfae83f5f8333dbb Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Fix Android autotests so that the resulting APKs actually runJake Petroules2017-09-018-36/+50
| | | | | | | | | | | | | | We don't have a NativeActivity for these apps, so remove that. We also don't have an Application subclass, so remove the android:name attribute from <application>. Finally, the android:name attribute of the <activity> must specify the activity class name (fully-qualified with the package name or with a leading dot). Opt for the latter. Lasty, correct the System.loadLibrary calls for the lib names actually embedded in each respective APK, and only load libraries built for the ABIs available on the device. Change-Id: I2b2e73a489fcda06dcf3541964eda9cf877163e8 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Android: Fix teapot autotest for older NDKsChristian Kandeler2017-08-301-2/+3
| | | | | Change-Id: Idf963fd5fd5f0be6a4e081922c089f78735fc095 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Separate the Java and Android autotests into their own suitesJake Petroules2017-08-2926-0/+541
Android is not inherently tied to Java. Android apps can be built without any Java at all (for example, using Kotlin and/or C++ instead of Java). This also paves the way to greatly expand the Android test suite as we should be independently testing various pieces of functionality rather than grouping everything into a single multi-axis test case. Change-Id: I0b2950e701461320e7eb7266acccc78f5d98261f Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-04 04:21:27 +0000