change copying of android java files a bit

androidservice/androidservice.pro

@@ -45,13 +45,19 @@ HEADERS += \
     ../nymea-app/platformintegration/android/platformhelperandroid.h \
 
 DISTFILES += \
-    ../nymea-app/platformintegration/android/io/guh/nymeaapp/Action.java \
+    java/io/guh/nymeaapp/Action.java \
-    ../nymea-app/platformintegration/android/io/guh/nymeaapp/NymeaAppControlService.java \
+    java/io/guh/nymeaapp/NymeaAppControlService.java \
-    ../nymea-app/platformintegration/android/io/guh/nymeaapp/NymeaAppService.java \
+    java/io/guh/nymeaapp/NymeaAppService.java \
-    ../nymea-app/platformintegration/android/io/guh/nymeaapp/NymeaAppControlsActivity.java \
+    java/io/guh/nymeaapp/NymeaAppControlsActivity.java \
-    ../nymea-app/platformintegration/android/io/guh/nymeaapp/NymeaAppServiceConnection.java \
+    java/io/guh/nymeaapp/NymeaAppServiceConnection.java \
-    ../nymea-app/platformintegration/android/io/guh/nymeaapp/Thing.java \
+    java/io/guh/nymeaapp/Thing.java \
-    ../nymea-app/platformintegration/android/io/guh/nymeaapp/State.java \
+    java/io/guh/nymeaapp/State.java \
-    ../nymea-app/platformintegration/android/io/guh/nymeaapp/NymeaHost.java \
+    java/io/guh/nymeaapp/NymeaHost.java \
     controlviews/Main.qml
 
+QMAKE_COPY_DIR=cp -f -R -v
+javafiles.commands = $(MKDIR) $${ANDROID_PACKAGE_SOURCE_DIR}/src;
+javafiles.commands += $(COPY_DIR) $${PWD}/java/io $${ANDROID_PACKAGE_SOURCE_DIR}/src/
+QMAKE_EXTRA_TARGETS += javafiles
+POST_TARGETDEPS += javafiles
+

config.pri

@@ -10,4 +10,15 @@ APP_VERSION=$$member(VERSION_INFO, 0)
 APP_REVISION=$$member(VERSION_INFO, 1)
 
 DEFINES+=APP_VERSION=\\\"$${APP_VERSION}\\\"
-android:QMAKE_POST_LINK += cp $$top_srcdir/version.txt $$top_builddir/
+
+android: {
+    QMAKE_POST_LINK += cp $$top_srcdir/version.txt $$top_builddir/
+
+    !equals(OVERLAY_PATH, ""):!equals(BRANDING, "") {
+        ANDROID_PACKAGE_SOURCE_DIR = $${OVERLAY_PATH}/packaging/android_$$BRANDING
+    } else {
+        ANDROID_PACKAGE_SOURCE_DIR = $${top_srcdir}/packaging/android
+    }
+    message("Andorid package source dir $${ANDROID_PACKAGE_SOURCE_DIR}")
+}
+

nymea-app/nymea-app.pro

@@ -51,12 +51,6 @@ win32 {
 }
 
 android {
-    !equals(OVERLAY_PATH, ""):!equals(BRANDING, "") {
-        ANDROID_PACKAGE_SOURCE_DIR = $${OVERLAY_PATH}/packaging/android_$$BRANDING
-    } else {
-        ANDROID_PACKAGE_SOURCE_DIR = $${top_srcdir}/packaging/android
-    }
-    message("andorid package dir $${ANDROID_PACKAGE_SOURCE_DIR}")
 
     android-clang {
         FIREBASE_STL_VARIANT = c++
@@ -75,10 +69,8 @@ android {
     HEADERS += platformintegration/android/platformhelperandroid.h
     SOURCES += platformintegration/android/platformhelperandroid.cpp
 
-    QMAKE_COPY_DIR=cp -f -R -v
+    # https://bugreports.qt.io/browse/QTBUG-83165
-    javafiles.commands = $$quote($(COPY_DIR) $${PWD}/platformintegration/android/io $${ANDROID_PACKAGE_SOURCE_DIR}/src/)
+    LIBS += -L$${top_builddir}/libnymea-app/$${ANDROID_TARGET_ARCH}
-    QMAKE_EXTRA_TARGETS += javafiles
-    POST_TARGETDEPS += javafiles
 
     DISTFILES += \
         $$ANDROID_PACKAGE_SOURCE_DIR/AndroidManifest.xml \
@@ -90,11 +82,16 @@ android {
         $$ANDROID_PACKAGE_SOURCE_DIR/gradle/wrapper/gradle-wrapper.properties \
         $$ANDROID_PACKAGE_SOURCE_DIR/gradlew.bat \
         $$ANDROID_PACKAGE_SOURCE_DIR/LICENSE \
-        platformintegration/android/io/guh/nymeaapp/NymeaAppActivity.java \
+        platformintegration/android/java/io/guh/nymeaapp/NymeaAppActivity.java \
-        platformintegration/android/io/guh/nymeaapp/NymeaAppNotificationService.java \
+        platformintegration/android/java/io/guh/nymeaapp/NymeaAppNotificationService.java \
+
+    QMAKE_COPY_DIR=cp -f -R -v
+    QMAKE_MKDIR_COMMAND=echo tralala; mkdir
+    javafiles.commands = $(MKDIR) $${ANDROID_PACKAGE_SOURCE_DIR}/src/;
+    javafiles.commands += $(COPY_DIR) $${PWD}/platformintegration/android/java/io $${ANDROID_PACKAGE_SOURCE_DIR}/src/;
+    QMAKE_EXTRA_TARGETS += javafiles
+    POST_TARGETDEPS += javafiles
 
-    # https://bugreports.qt.io/browse/QTBUG-83165
-    LIBS += -L$${top_builddir}/libnymea-app/$${ANDROID_TARGET_ARCH}
 }
 
 macx: {