D13404: Make it possible to build Marble with KDE Android tooling

[Aleix Pol Gonzalez]

apol added a comment.


I intentionally left the old logic so it doesn't break your work-flow but it should allow to remove quite some code.

Also I didn't really understand what's going on with these python scripts.

REPOSITORY
R34 Marble

REVISION DETAIL
https://phabricator.kde.org/D13404

To: apol, #marble
Cc: marble-devel, kde-edu, torhamzed, jalvarez, tjakobi, mnafees, shentey, chaz6, dkolozsvari, narvaez, cmihalache, rahn, apol, nienhueser

[Aleix Pol Gonzalez]

apol created this revision.
apol added a reviewer: Marble.
Restricted Application added projects: Marble, KDE Edu.
Restricted Application added subscribers: kde-edu, marble-devel.
apol requested review of this revision.

REVISION SUMMARY
It will allow to have it built by the CI and appear on
binary-factory.kde.org.

Depends on D13403 <https://phabricator.kde.org/D13403>

REPOSITORY
R34 Marble

BRANCH
master

REVISION DETAIL
https://phabricator.kde.org/D13404

AFFECTED FILES
src/apps/behaim/CMakeLists.txt
src/apps/behaim/package/AndroidManifest.xml
src/apps/marble-maps/CMakeLists.txt
src/apps/marble-maps/package/AndroidManifest.xml

To: apol, #marble
Cc: marble-devel, kde-edu, torhamzed, jalvarez, tjakobi, mnafees, shentey, chaz6, dkolozsvari, narvaez, cmihalache, rahn, apol, nienhueser

[Aleix Pol Gonzalez]

apol added a comment.


Ping

REPOSITORY
R34 Marble

REVISION DETAIL
https://phabricator.kde.org/D13404

To: apol, #marble
Cc: marble-devel, kde-edu, torhamzed, jalvarez, tjakobi, mnafees, shentey, chaz6, dkolozsvari, narvaez, cmihalache, rahn, apol, nienhueser

[Aleix Pol Gonzalez]

apol added a comment.


Can I please have a review?

REPOSITORY
R34 Marble

REVISION DETAIL
https://phabricator.kde.org/D13404

To: apol, #marble
Cc: marble-devel, kde-edu, torhamzed, jalvarez, tjakobi, mnafees, shentey, chaz6, dkolozsvari, narvaez, cmihalache, rahn, apol, nienhueser

[Sanjiban Bairagya]

sanjibanb added a comment.


I was just wondering if there is a way to test these changes locally?

INLINE COMMENTS

AndroidManifest.xml:22
</intent-filter>
- <meta-data android:name="android.app.lib_name" android:value="-- %%INSERT_APP_LIB_NAME%% --"/>
+ <meta-data android:name="android.app.lib_name" android:value="Marble"/>

Not too important, but can we change it from "Marble" to "MarbleMaps"? This would help distinguish it as the Android app and not the Desktop version.

Making similar changes in marble-maps/CMakeLists.txt as well would help retain this consistency.

REPOSITORY
R34 Marble

REVISION DETAIL
https://phabricator.kde.org/D13404

To: apol, #marble
Cc: sanjibanb, marble-devel, kde-edu, torhamzed, jalvarez, tjakobi, mnafees, shentey, chaz6, dkolozsvari, narvaez, cmihalache, rahn, apol, nienhueser

[Aleix Pol Gonzalez]

apol added a comment.

Post by Sanjiban Bairagya
I was just wondering if there is a way to test these changes locally?

Sure!
https://community.kde.org/Android/Environment_via_Container

INLINE COMMENTS

Post by Sanjiban Bairagya
sanjibanb wrote in AndroidManifest.xml:22
Not too important, but can we change it from "Marble" to "MarbleMaps"? This would help distinguish it as the Android app and not the Desktop version.
Making similar changes in marble-maps/CMakeLists.txt as well would help retain this consistency.

It's the target name. I really don't mind what we call it. Just needs to be the same as passed to add_executable.

REPOSITORY
R34 Marble

REVISION DETAIL
https://phabricator.kde.org/D13404

To: apol, #marble
Cc: sanjibanb, marble-devel, kde-edu, torhamzed, jalvarez, tjakobi, mnafees, shentey, chaz6, dkolozsvari, narvaez, cmihalache, rahn, apol, nienhueser

[Sanjiban Bairagya]

sanjibanb added a comment.


Cool thanks, I'll update this by 22nd July.

REPOSITORY
R34 Marble

REVISION DETAIL
https://phabricator.kde.org/D13404

To: apol, #marble
Cc: sanjibanb, marble-devel, kde-edu, torhamzed, jalvarez, tjakobi, mnafees, shentey, chaz6, dkolozsvari, narvaez, cmihalache, rahn, apol, nienhueser

[Sanjiban Bairagya]

sanjibanb accepted this revision as: sanjibanb.
This revision is now accepted and ready to land.

REPOSITORY
R34 Marble

BRANCH
master

REVISION DETAIL
https://phabricator.kde.org/D13404

To: apol, #marble, sanjibanb
Cc: sanjibanb, marble-devel, kde-edu, torhamzed, jalvarez, tjakobi, mnafees, shentey, chaz6, dkolozsvari, narvaez, cmihalache, rahn, apol, nienhueser

[Aleix Pol Gonzalez]

This revision was automatically updated to reflect the committed changes.
Closed by commit R34:5893973153c8: Make it possible to build Marble with KDE Android tooling (authored by apol).

REPOSITORY
R34 Marble

CHANGES SINCE LAST UPDATE
https://phabricator.kde.org/D13404?vs=35752&id=38215

REVISION DETAIL
https://phabricator.kde.org/D13404

AFFECTED FILES
src/apps/behaim/CMakeLists.txt
src/apps/behaim/package/AndroidManifest.xml
src/apps/marble-maps/CMakeLists.txt
src/apps/marble-maps/package/AndroidManifest.xml

To: apol, #marble, sanjibanb
Cc: sanjibanb, marble-devel, kde-edu, torhamzed, jalvarez, tjakobi, mnafees, shentey, chaz6, dkolozsvari, narvaez, cmihalache, rahn, apol, nienhueser