Android: Fix cmake generator

Fixes: QTBUG-29859
Change-Id: Id0b5f9ab8b4866483361ba9f15cf51dc0d2627d0
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

mkspecs/features/create_cmake.prf

@@ -42,6 +42,9 @@ CMAKE_INCLUDE_NAME = $$eval(QT.$${MODULE}.name)
 # (or QtCore_{libinfix_suffix}, Foo_{libinfix_suffix} on macos with -framework).
 CMAKE_QT_STEM = $${TARGET}
 
+# ANDROID_ABI is set by the android toolchain file, see https://developer.android.com/ndk/guides/cmake
+android: CMAKE_QT_STEM = $$replace(CMAKE_QT_STEM, "_$${QT_ARCH}", '_\$\{ANDROID_ABI\}')
+
 # On macOS when building just a debug configuration which is not part of debug_and_release,
 # $${TARGET} already contains a _debug suffix, as per the following call chain:
 # qt_module.prf -> qt5LibraryTarget -> qtLibraryTarget -> qtPlatformTargetSuffix.

src/corelib/corelib.pro

@@ -21,7 +21,7 @@ CONFIG += simd optimize_full
 QMAKE_DOCS = $$PWD/doc/qtcore.qdocconf
 
 ANDROID_LIB_DEPENDENCIES = \
-    plugins/platforms/android/libqtforandroid.so
+    plugins/platforms/libqtforandroid.so
 ANDROID_BUNDLED_JAR_DEPENDENCIES = \
     jar/QtAndroid.jar
 ANDROID_PERMISSIONS = \

src/plugins/platforms/android/android.pro

@@ -93,7 +93,3 @@ qtConfig(vulkan) {
 
 PLUGIN_TYPE = platforms
 load(qt_plugin)
-
-#Non-standard install directory, QTBUG-29859
-DESTDIR = $$DESTDIR/android
-target.path = $${target.path}/android