Android porting (#929)

android-porting branch will remain for history of changes Co-authored-by: Lucas Corailler <[email protected]> Co-authored-by: lucascorailler <[email protected]> Co-authored-by: philippe.docourt <[email protected]> Co-authored-by: philippe-docourt-digital-solutions <70904257+philippe-docourt-digital-solutions@users.noreply.github.com>
Mobsya · Jun 18, 2021 · 983d3a3 · 983d3a3
1 parent 4cdbb38
commit 983d3a3
Show file tree

Hide file tree

Showing 30 changed files with 536 additions and 2,326 deletions.
diff --git a/.gitignore b/.gitignore
@@ -12,3 +12,8 @@ enki/
 build/
 *.qmlc
 *.jsc
+CMakeLists.txt.user
+
+scratch/
+vpl3-thymio-suite/
+*.jks
diff --git a/.gitmodules b/.gitmodules
@@ -8,7 +8,7 @@
 	path = third_party/libusb/libusb
 	url = https://github.com/Mobsya/libusb.git
 [submodule "android/qt-android-cmake"]
-	path = third_party/qt-android-cmake
+	path = android/qt-android-cmake
 	url = https://github.com/Mobsya/qt-android-cmake.git
 [submodule "third_party/spdlog/spdlog"]
 	path = third_party/spdlog/spdlog

diff --git a/android/qt-android-cmake b/android/qt-android-cmake
diff --git a/android/qt-android-cmake/AddQtAndroidApk.cmake b/android/qt-android-cmake/AddQtAndroidApk.cmake
diff --git a/android/qt-android-cmake/AndroidManifest.xml.in b/android/qt-android-cmake/AndroidManifest.xml.in
diff --git a/android/qt-android-cmake/license.txt b/android/qt-android-cmake/license.txt
diff --git a/android/qt-android-cmake/qtdeploy.json.in b/android/qt-android-cmake/qtdeploy.json.in