summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorLeander Beernaert <leander.beernaert@qt.io>2019-08-30 11:34:23 +0200
committerLeander Beernaert <leander.beernaert@qt.io>2019-08-30 12:10:26 +0000
commiteeffac526ead99175125421f4f83356113460eaa (patch)
treefcce9e4c3221cb103e35a826e8039952e69f101a /bin
parent6c15ad79788b6ccbba0fde73fb09cfcd15cce608 (diff)
Update Android build configuration
Update Android build configuration to be compatible with the multi-arch android build patch to qmake. We can now build and generate the apk correctly. Executing on the device/simulator will only work once the latest changes from 5.14 have been merged in. We now replace target suffix with ${CMAKE_ANDROID_ARCH_ABI}.[so|a] so we don't have to deal with handling targets which might have any of the OUTPUT_NAME properties set. The dependency and deploy settings generation has also been updated to append the file contents to a string and then do a single file write at the end. Change-Id: Id3c5bd0428141ecaf962124a100390e3a4e41feb Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'bin')
0 files changed, 0 insertions, 0 deletions