diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2018-08-02 18:19:20 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2018-08-10 10:38:12 +0000 |
| commit | 6464a075c5edfafb3a88bfc4097b3d5d9b9cdb28 (patch) | |
| tree | f69681c5317c1b96de01d37077c0eee087dcbb3c /doc/targets/qbs-target-android.qdoc | |
| parent | d7715770c02d10593921ee5c3d3fd4c03a4f85d1 (diff) | |
Enable the Application item to create Android apps
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>
Diffstat (limited to 'doc/targets/qbs-target-android.qdoc')
| -rw-r--r-- | doc/targets/qbs-target-android.qdoc | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/doc/targets/qbs-target-android.qdoc b/doc/targets/qbs-target-android.qdoc index e5d52337f..46081db0d 100644 --- a/doc/targets/qbs-target-android.qdoc +++ b/doc/targets/qbs-target-android.qdoc @@ -55,11 +55,11 @@ \li Shared libraries containing native code. \endlist - You can use the \l{AndroidApk} item to build application - packages for Android. The properties of the AndroidApk item specify the - locations of the APK source files. + You can use the \l{Application} item to build application + packages for Android. - The AndroidApk item has a dependency on the \l{Android.sdk} module, which + If the \l{qbs::targetPlatform}{target platform} is \c{"android"}, then the Application item has + a dependency on the \l{Android.sdk} module, which contains the properties and rules to create Android application packages from source files. @@ -67,7 +67,11 @@ Android libraries that are bundled into the APK. The \c qbs.architectures property specifies the architectures to build for, with the default value \c armv7a. + If you have only one native library, you can simply list its sources + within the main Application item, and it will get built and packaged + automatically. - The \l{DynamicLibrary} item has a dependency on the \l{Android.ndk} module, + The \l{DynamicLibrary} item, as well as the \l CppApplication item, + has a dependency on the \l{Android.ndk} module, and contains the properties and rules to create native libraries. */ |