summaryrefslogtreecommitdiffstats
path: root/mkspecs/features/java.prf
Commit message (Collapse)AuthorAgeFilesLines
* actually use DIRLIST_SEPARATOROswald Buddenhagen2014-10-011-1/+1
| | | | | | | | | it's QMAKE_DIRLIST_SEP and DIRLIST_SEPARATOR. pure evil. Task-number: QTBUG-41668 Change-Id: Ie2f6db6530e0f50bc1ce5db593180e7ad703766b Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* Android: export ANDROID_SDK_BUILD_TOOLS_REVISION.BogDan Vatra2014-07-311-19/+5
| | | | | | | | | | It's needed by androiddeployqt tool to run "zipalign" tool and to set it to gradle properties. Task-number:QTBUG-40481 Change-Id: I3dd665a7461a4e981867cdad75a50940e46a5ae6 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* untangle use of system vs. shell path(-list) semanticsOswald Buddenhagen2014-04-301-1/+1
| | | | | | | | | | | | | | | "system" refers to the system's native shell, which is what qmake's system() invokes, and whose convention by far most commands invoked from a makefile will need. "shell" refers to the shell invoked by make, which diverges from the system shell only when qmake/mingw32-make is called from an msys shell. its conventions need to be used for anything the shell itself does (e.g., assembling env variables, but also command line argument unquoting) and the commands the mkspec sets according to the shell (e.g., QMAKE_MOVE). Change-Id: I0000aa9417c199cf8a810619d31ded24bb0675f9 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Android: Build against new build tools revisionsEskil Abrahamsen Blomfeldt2013-10-041-1/+7
| | | | | | | | | | | | Whenever the SDK updates the build tools it's put inside a new subdirectory with the version number, so with every new version we would have to update the java.prf feature. Instead, we iterate over the available revisions and pick the lexicographically highest one (which is sufficient as long as the major version is double digits.) Change-Id: I2392ef6261ef36ed741c80fa6f981486e7844e0a Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* Android: Let ANDROID_API_VERSION env var take precedenceEskil Abrahamsen Blomfeldt2013-09-201-5/+5
| | | | | | | | | | | | | If you specify ANDROID_API_VERSION to override the default API versions used for building the jar files, this should take precedence even when the .pro files specify a different default API version (like QtAccessibility does when it sets the default to android-16.) Otherwise it's impossible to override these defaults. Change-Id: Idef98aaf3b51490bd7ced8c53770ee2f5680b1db Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com> Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* Fix bootstrap class path warning (java)Frederik Gladhorn2013-08-221-4/+5
| | | | | | | | | | Due to forcing java 6 we need to pass the bootstrap jar file (android.jar). https://blogs.oracle.com/darcy/entry/bootclasspath_older_source Change-Id: I530a7e2a7df40813011a6dde93d6ccc3aaaa61d6 warning: [options] bootstrap class path not set in conjunction with -source 1.6 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* Make java xlint warnings visibleFrederik Gladhorn2013-08-161-1/+1
| | | | | Change-Id: If347c920df5e5aa0924a9f8d626d7e3e017d3536 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* Android Windows: Adjust to new SDK layoutRay Donnelly2013-07-041-1/+7
| | | | | | | | | | | | | Google moved dx.bat into a new build-tools/VERSION folder meaning our dx.bat no longer found dx.jar. Fix this by passing into our dx.bat, the location of the real dx.bat Removed hardcoded 17.0.0 and %ANDROID_BUILD_TOOLS_REVISION% path searches. Change-Id: I91c12c01745d6f12edbd126102b8f06eba291402 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* Android: Compile jar file on WindowsEskil Abrahamsen Blomfeldt2013-05-281-1/+1
| | | | | | | | | | | | Due to the way the DEX_CMD is formatted on Windows this would break every time. Since we actually bundle dx.bat in the repository, there's no need to check for its existence, so the easy fix is just to move the existence check into the code path where it's run from the SDK. Task-number: QTBUG-31405 Change-Id: If1aeb744d3abbd2488153b13aac401436965074e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Ray Donnelly <mingw.android@gmail.com>
* Fix Qt for Android build with recent SDK bundleEskil Abrahamsen Blomfeldt2013-05-211-0/+7
| | | | | | | | | | | | | | | In the recent revisions of the Android SDK bundle, the dx tool has moved from platform-tools/ and into build-tools/<revision-number> where revision-number is 17.0.0 at the moment. To enable building on these SDKs, we add detection for the dx tool and an environment variable which can be set to override the revision number to provide a way to build it against future revisions as well. Task-number: QTBUG-31199 Change-Id: I0d6a22163dc2e50f7a81cd3fe8f3d53c6335aaee Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* Enable bundling Qt in Android package in build systemEskil Abrahamsen Blomfeldt2013-05-011-8/+10
| | | | | | | | | | | | | | | | | | | | | For bundling Qt, we need two things: 1. We need to build a regular .jar file out of the Java files, so that they can be built into the app package. Dexing the classes first (i.e. compiling the JVM bytecode to Dalvik bytecode) is required for loading the .jar file at run-time, but cannot be used for building it into the app, so we need two different paths. 2. We need to specify which extra files have to be bundled for each module (this is primarily for plugins and imports). This is because there is no static dependency on these files, so it cannot be detected during deployment. Task-number: QTBUG-30751 Change-Id: I733603ee5d1c64bd7c5b9357eb5d993b9d0298f7 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Android: Portability fix for java usage on Windows.Ray Donnelly2013-04-031-1/+1
| | | | | Change-Id: Ic72957e21b2edc92d2ca8d99099f221ffeeb8c95 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Android: Enable the java feature on Windows.Ray Donnelly2013-04-031-1/+5
| | | | | | | | | | | | | There is a bug in dx.bat in the Google Android SDK tool where relative paths do not work correctly. We need to use our own version of this tool until: https://android-review.googlesource.com/#/c/52680/ ..is merged. Change-Id: I451a3239590919d014a673f3e8e17244e96676ab Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Introducing the Qt Android portPaul Olav Tvete2013-03-051-0/+61
Based on the Necessitas project by Bogdan Vatra. Contributors to the Qt5 project: BogDan Vatra <bogdan@kde.org> Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> hjk <hjk121@nokiamail.com> Oswald Buddenhagen <oswald.buddenhagen@digia.com> Paul Olav Tvete <paul.tvete@digia.com> Robin Burchell <robin+qt@viroteck.net> Samuel Rødal <samuel.rodal@digia.com> Yoann Lopes <yoann.lopes@digia.com> The full history of the Qt5 port can be found in refs/old-heads/android, SHA-1 249ca9ca2c7d876b91b31df9434dde47f9065d0d Change-Id: Iff1a7b2dbb707c986f2639e65e39ed8f22430120 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-04 08:48:08 +0000