🏗️ Prototype: Android + Cmake #4301

strseb · 2022-08-30T18:02:08Z

Description

Switch build pipeline from:

Script.->Qmake->make->qmlimportscanner->gradle

We will build the client with cmake. Cmake will be invoked by gradle.
This allow's us to build the client with one command (theoreticly) gradlew assemble, and gives us the ability to define cmake/ndk versions as a classic gradle dependency.

Handling can stay the same as the package.sh now will just set gradle up, instead of qmake :)

bakulf

Can you remove qmake/platforms/android.pri and add something like this:
https://github.com/mozilla-mobile/mozilla-vpn-client/blob/main/src/src.pro#L44

bakulf · 2022-09-05T06:13:48Z

CMakeLists.txt

+    # Otherwise the NDK Toolchain wont find qt
+    set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE NEVER)
+
+    set(QT_HOST_PATH "~/Code/Qt/6.2.4/macos")


Can we remove this and use and env var?

bakulf · 2022-09-22T15:24:11Z

android/buildSrc/src/main/kotlin/Config.kt

@@ -7,5 +7,5 @@ object Config {
    const val buildToolsVersion = "30.0.3"
    const val minSdkVersion = 24
    const val targetSdkVersion = 30
-    const val ndkVersion = "23.1.7779620"
+    const val ndkVersion = "24.0.8215888"


do we need to update the documentation in the README file or elsewhere?

bakulf · 2022-09-22T15:24:34Z

android/buildSrc/src/main/kotlin/QtConfig.kt

@@ -0,0 +1,226 @@
+import org.gradle.api.Plugin


bakulf · 2022-09-22T15:28:47Z

android/buildSrc/src/main/kotlin/VPNVersion.kt

@@ -0,0 +1,43 @@
+import org.gradle.api.Plugin


android/buildSrc/src/main/kotlin/QtConfig.kt

android/buildSrc/src/main/kotlin/VPNVersion.kt

codecov-commenter · 2022-09-27T20:06:18Z

Codecov Report

Base: 56.36% // Head: 16.40% // Decreases project coverage by -39.96% ⚠️

Coverage data is based on head (68309d2) compared to base (88dbef3).
Patch has no changes to coverable lines.

Additional details and impacted files

@@             Coverage Diff             @@
##             main    #4301       +/-   ##
===========================================
- Coverage   56.36%   16.40%   -39.97%     
===========================================
  Files          12       71       +59     
  Lines         605     3719     +3114     
  Branches      288     1789     +1501     
===========================================
+ Hits          341      610      +269     
- Misses        264     2794     +2530     
- Partials        0      315      +315

Flag	Coverage Δ
lottie_tests	`56.36% <ø> (ø)`
qml_tests	`7.51% <ø> (?)`

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files	Coverage Δ
src/featureslistcallback.h	`0.00% <ø> (ø)`
lottie/lib/lottieprivate.cpp	`13.63% <0.00%> (ø)`
lottie/lib/lottieprivatewindow.cpp	`76.81% <0.00%> (ø)`
src/urlopener.cpp	`0.00% <0.00%> (ø)`
src/filterproxymodel.cpp	`54.71% <0.00%> (ø)`
src/logger.cpp	`22.00% <0.00%> (ø)`
src/qmlengineholder.h	`100.00% <0.00%> (ø)`
tests/qml/main.cpp	`100.00% <0.00%> (ø)`
src/mozillavpn.h	`80.00% <0.00%> (ø)`
src/networkmanager.cpp	`9.80% <0.00%> (ø)`
... and 52 more

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report at Codecov.
📢 Do you have feedback about the report comment? Let us know in this issue.

android/buildSrc/src/main/kotlin/QtConfig.kt

github-actions · 2022-10-31T13:47:37Z

android/buildSrc/src/main/kotlin/QtConfig.kt

+        val importScannerList = arrayOf(
+            File("$host/libexec/qmlimportscanner"),
+            File("$host/bin/qmlimportscanner"),
+            File("$host/bin/qmlimportscanner.exe"),


🚫 [ktlint] _{reported by reviewdog 🐶}
Unnecessary trailing comma before ")"

github-actions · 2022-10-31T13:47:37Z

android/buildSrc/src/main/kotlin/QtConfig.kt

+            File("$host/bin/qmlimportscanner"),
+            File("$host/bin/qmlimportscanner.exe"),
+        )
+        val importScanner = importScannerList.firstOrNull{it.exists()}


🚫 [ktlint] _{reported by reviewdog 🐶}
Missing spacing around "{"

github-actions · 2022-10-31T13:47:37Z

android/buildSrc/src/main/kotlin/QtConfig.kt

+            File("$host/bin/qmlimportscanner"),
+            File("$host/bin/qmlimportscanner.exe"),
+        )
+        val importScanner = importScannerList.firstOrNull{it.exists()}


🚫 [ktlint] _{reported by reviewdog 🐶}
Missing spacing before "}"

github-actions · 2022-10-31T13:47:37Z

android/buildSrc/src/main/kotlin/QtConfig.kt

+        )
+        val importScanner = importScannerList.firstOrNull{it.exists()}
+            ?: {
+                error("Did not found qmlimportscanner in ${importScannerList}")


🚫 [ktlint] _{reported by reviewdog 🐶}
Redundant curly braces

strseb added 14 commits June 30, 2022 13:14

meh

bb08316

IT BUILDS

f3a9361

nearly there

cbd4bca

add all my todo's for later

e7e1a39

Export main entry point

58182af

PROGRESS

b64d0fe

NEARLY THERE

ef86c49

Not quite there :c

3821fde

WORKING

a15a067

Auto generate the version

c77bbc6

cleanup

63d023f

adjust support and wrapper

d959b11

fix gradle cli

db1a66e

Cleanup of build.gradle

e55107d

strseb changed the title ~~🏗️ Prototype: Android -> Gradle -> Cmake~~ 🏗️ Prototype: Android + Cmake Aug 31, 2022

strseb force-pushed the basti/prototype/sadCmake branch from 27e803b to cd9ca64 Compare August 31, 2022 11:14

Skip QmlImport scanner if the ABI is not present

8c016f0

strseb force-pushed the basti/prototype/sadCmake branch from cd9ca64 to 8c016f0 Compare August 31, 2022 11:22

Pre-install the ndk

cb1598c

strseb force-pushed the basti/prototype/sadCmake branch from fe625dd to cb1598c Compare August 31, 2022 12:26

strseb mentioned this pull request Sep 14, 2022

Cross-Plattform Crash Reporting #4455

Merged

5 tasks

strseb requested a review from oskirby September 22, 2022 15:13

bakulf approved these changes Sep 22, 2022

View reviewed changes

Merge remote-tracking branch 'origin/main' into basti/prototype/sadCmake

744b792

github-actions bot reviewed Sep 27, 2022

View reviewed changes

WHAT.

522ff0b

strseb force-pushed the basti/prototype/sadCmake branch from 79b6183 to 522ff0b Compare September 27, 2022 22:30

strseb added 2 commits October 24, 2022 15:51

Fix: Specify Pending-Intent mutability

963e278

remove not needed changes

5b258e1

github-actions bot reviewed Oct 25, 2022

View reviewed changes

strseb added 2 commits October 25, 2022 17:12

Make sdk dir writeable

755c925

Get right cmake version

ecd71cb

strseb force-pushed the basti/prototype/sadCmake branch 3 times, most recently from eb75013 to b029cde Compare October 27, 2022 11:49

Fix CI scripts

967339e

strseb force-pushed the basti/prototype/sadCmake branch from b029cde to 967339e Compare October 27, 2022 12:17

Windows related fixes

5c2f285

github-actions bot reviewed Oct 31, 2022

View reviewed changes

Merge remote-tracking branch 'origin/main' into basti/prototype/sadCmake

68309d2

strseb force-pushed the basti/prototype/sadCmake branch from b3891eb to 68309d2 Compare October 31, 2022 13:49

strseb mentioned this pull request Oct 31, 2022

Android CMake MVP #4769

Merged

strseb closed this Nov 11, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

🏗️ Prototype: Android + Cmake #4301

🏗️ Prototype: Android + Cmake #4301

strseb commented Aug 30, 2022 •

edited

Loading

bakulf left a comment

bakulf Sep 5, 2022

bakulf Sep 22, 2022

bakulf Sep 22, 2022

bakulf Sep 22, 2022

codecov-commenter commented Sep 27, 2022 •

edited

Loading

github-actions bot Oct 31, 2022

github-actions bot Oct 31, 2022

github-actions bot Oct 31, 2022

github-actions bot Oct 31, 2022

🏗️ Prototype: Android + Cmake #4301

🏗️ Prototype: Android + Cmake #4301

Conversation

strseb commented Aug 30, 2022 • edited Loading

Description

bakulf left a comment

Choose a reason for hiding this comment

bakulf Sep 5, 2022

Choose a reason for hiding this comment

bakulf Sep 22, 2022

Choose a reason for hiding this comment

bakulf Sep 22, 2022

Choose a reason for hiding this comment

bakulf Sep 22, 2022

Choose a reason for hiding this comment

codecov-commenter commented Sep 27, 2022 • edited Loading

Codecov Report

github-actions bot Oct 31, 2022

Choose a reason for hiding this comment

github-actions bot Oct 31, 2022

Choose a reason for hiding this comment

github-actions bot Oct 31, 2022

Choose a reason for hiding this comment

github-actions bot Oct 31, 2022

Choose a reason for hiding this comment

strseb commented Aug 30, 2022 •

edited

Loading

codecov-commenter commented Sep 27, 2022 •

edited

Loading