Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Android CMake MVP #4769

Merged
merged 6 commits into from
Nov 1, 2022
Merged

Android CMake MVP #4769

merged 6 commits into from
Nov 1, 2022

Conversation

strseb
Copy link
Collaborator

@strseb strseb commented Oct 31, 2022

The original pr -> #4301 was a bit too much to chew of.
Turns out this worked fine with the current Qt, but on 6.4 we would have pain upgrading.

Let's be more iterative: this pr just switches from qmake to cmake for debug builds, as adjust files are missing. That will be the next followup :)
The whole android-deploy step remains unchanged.

@strseb strseb requested a review from bakulf October 31, 2022 15:43
@codecov-commenter
Copy link

codecov-commenter commented Oct 31, 2022

Codecov Report

Base: 61.92% // Head: 62.11% // Increases project coverage by +0.18% 🎉

Coverage data is based on head (0177b16) compared to base (045b97c).
Patch has no changes to coverable lines.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #4769      +/-   ##
==========================================
+ Coverage   61.92%   62.11%   +0.18%     
==========================================
  Files         327      327              
  Lines       21595    21632      +37     
  Branches     7072    10521    +3449     
==========================================
+ Hits        13372    13436      +64     
- Misses       6356     6367      +11     
+ Partials     1867     1829      -38     
Flag Coverage Δ
functional_tests 25.90% <ø> (-1.22%) ⬇️
lottie_tests 56.36% <ø> (ø)
qml_tests 7.54% <ø> (+0.02%) ⬆️
unit_tests 71.41% <ø> (-2.25%) ⬇️

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

Impacted Files Coverage Δ
src/featureslistcallback.h 82.14% <ø> (ø)
src/models/subscriptiondata.h 0.00% <0.00%> (-75.00%) ⬇️
glean/glean.cpp 0.00% <0.00%> (-66.67%) ⬇️
nebula/nebula.cpp 0.00% <0.00%> (-66.67%) ⬇️
src/profileflow.cpp 0.00% <0.00%> (-47.77%) ⬇️
src/controllerimpl.h 66.66% <0.00%> (-33.34%) ⬇️
src/models/subscriptiondata.cpp 0.64% <0.00%> (-19.36%) ⬇️
...subscriptiondetails/taskgetsubscriptiondetails.cpp 0.00% <0.00%> (-14.45%) ⬇️
...addons/conditionwatchers/addonconditionwatcher.cpp 71.42% <0.00%> (-14.29%) ⬇️
src/filterproxymodel.cpp 44.21% <0.00%> (-12.40%) ⬇️
... and 95 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.

scripts/android/cmake.sh Outdated Show resolved Hide resolved
scripts/android/cmake.sh Show resolved Hide resolved
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.

. $(dirname $0)/../utils/commons.sh
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

set -e

@bakulf
Copy link
Collaborator

bakulf commented Oct 31, 2022

Can you also change src.pro to do something like:

} else:android {
error(qmake is not supported for Android. Please use cmake.)

And remove src/qmake/platform/android.pri

@strseb
Copy link
Collaborator Author

strseb commented Oct 31, 2022

Can you also change src.pro to do something like:

} else:android {
error(qmake is not supported for Android. Please use cmake.)

And remove src/qmake/platform/android.pri

We can do that, once we can do release builds with cmake. The adjust stuff is missing rn :)

@strseb strseb merged commit 50b50c1 into main Nov 1, 2022
@strseb strseb deleted the basti/miniCMake branch November 1, 2022 12:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants