Differential D15643

Android: Allow passing a relative path as the apk dir
ClosedPublic
Actions

Authored by apol on Sep 21 2018, 10:36 AM.

Details

Reviewers
jjazeix
Group Reviewers
Frameworks
GCompris
Commits
R240:453ba4fee312: Android: Allow passing a relative path as the apk dir
Summary

This way the project can generate automatically its own manifest file.
GCompris is using it to set the version.

Test Plan

Built GCompris without a warning saying the apkdir isn't found

Diff Detail

Repository
R240 Extra CMake Modules
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.
apol created this revision.Sep 21 2018, 10:36 AM
Restricted Application added projects: Frameworks, Build System. · View Herald TranscriptSep 21 2018, 10:36 AM
Restricted Application added subscribers: kde-buildsystem, kde-frameworks-devel. · View Herald Transcript
apol requested review of this revision.Sep 21 2018, 10:36 AM
jjazeix added a subscriber: jjazeix.Sep 21 2018, 12:15 PM

Seems good to me at first sight, I'll try it as soon as possible

jjazeix added a comment.EditedSep 21 2018, 5:54 PM

Unfortunately, this does not work. The tmpAndroid folder is created in the build folder after running cmake, so it's not available before:

  Cannot find tmpAndroid//AndroidManifest.xml according to ANDROID_APK_DIR.
  tmpAndroid/ GCompris
Call Stack (most recent call first):
  /opt/cmake/share/cmake-3.11/Modules/CMakeDetermineSystem.cmake:94 (include)
  CMakeLists.txt:4 (project)
apol added a comment.Sep 28 2018, 2:03 PM

Are you sure you applied the patch properly? You are getting the warning that we are guarding against.

apol updated this revision to Diff 42483.Sep 28 2018, 2:03 PM

Rebased

jjazeix accepted this revision.Sep 28 2018, 4:59 PM

works fine, sorry for the doubt, I probably badly applied it last time.

This revision is now accepted and ready to land.Sep 28 2018, 4:59 PM
Closed by commit R240:453ba4fee312: Android: Allow passing a relative path as the apk dir (authored by apol). · Explain WhySep 29 2018, 12:40 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtoolchain/Android.cmake (2 lines)

Diff 42531

View Options

toolchain/Android.cmake

Loading...