Merge lp://staging/~morphis/platform-api/add-android-5x-support into lp://staging/platform-api
Proposed by
Simon Fels
Status: | Needs review |
---|---|
Proposed branch: | lp://staging/~morphis/platform-api/add-android-5x-support |
Merge into: | lp://staging/platform-api |
Diff against target: |
81 lines (+26/-2) 3 files modified
android/hybris/Android.mk (+5/-0) android/hybris/event_loop.h (+3/-0) android/hybris/ubuntu_application_gps_for_hybris.cpp (+18/-2) |
To merge this branch: | bzr merge lp://staging/~morphis/platform-api/add-android-5x-support |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot | continuous-integration | Needs Fixing | |
Ubuntu Phablet Team | Pending | ||
Review via email:
|
Commit message
As Avila is 5.x based we need to take this into account when building platform-api and adjust for any API changes while still keeping support for Anroid 4.x
Description of the change
As Avila is 5.x based we need to take this into account when building platform-api and adjust for any API changes while still keeping support for Anroid 4.x
This only touches the Android side of platform-api.
To post a comment you must log in.
Unmerged revisions
- 317. By Simon Fels
-
Import changes from Avila tree for Android 5.x support
FAILED: Continuous integration, rev:317 jenkins. qa.ubuntu. com/job/ platform- api-ci/ 466/ jenkins. qa.ubuntu. com/job/ platform- api-vivid- amd64-ci/ 79 jenkins. qa.ubuntu. com/job/ platform- api-vivid- armhf-ci/ 79 jenkins. qa.ubuntu. com/job/ platform- api-vivid- armhf-ci/ 79/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ platform- api-vivid- i386-ci/ 79/console
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
deb: http://
FAILURE: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/platform- api-ci/ 466/rebuild
http://