Merge lp://staging/~morphis/platform-api/add-hybris-compat-layer into lp://staging/platform-api
Proposed by
Simon Fels
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://staging/~morphis/platform-api/add-hybris-compat-layer |
| Merge into: | lp://staging/platform-api |
| Diff against target: |
14700 lines (+14058/-22) 95 files modified
CMakeLists.txt (+4/-5) android/compat/Android.common.mk (+10/-0) android/compat/camera/Android.mk (+58/-0) android/compat/camera/camera_compatibility_layer.cpp (+1016/-0) android/compat/camera/direct_camera_test.cpp (+683/-0) android/compat/input/Android.mk (+77/-0) android/compat/input/direct_input_test.cpp (+85/-0) android/compat/input/input_compatibility_layer.cpp (+384/-0) android/compat/media/Android.mk (+187/-0) android/compat/media/SimplePlayer.cpp (+777/-0) android/compat/media/SimplePlayer.h (+120/-0) android/compat/media/camera_service.cpp (+52/-0) android/compat/media/codec.cpp (+433/-0) android/compat/media/decoding_service.cpp (+366/-0) android/compat/media/decoding_service_priv.h (+208/-0) android/compat/media/direct_media_test.cpp (+417/-0) android/compat/media/direct_media_test.h (+58/-0) android/compat/media/media_codec_layer.cpp (+879/-0) android/compat/media/media_codec_list.cpp (+281/-0) android/compat/media/media_compatibility_layer.cpp (+693/-0) android/compat/media/media_format_layer.cpp (+245/-0) android/compat/media/media_format_layer_priv.cpp (+50/-0) android/compat/media/media_format_layer_priv.h (+68/-0) android/compat/media/media_recorder.cpp (+747/-0) android/compat/media/media_recorder.h (+269/-0) android/compat/media/media_recorder_client.cpp (+333/-0) android/compat/media/media_recorder_client.h (+81/-0) android/compat/media/media_recorder_factory.cpp (+133/-0) android/compat/media/media_recorder_factory.h (+72/-0) android/compat/media/media_recorder_layer.cpp (+506/-0) android/compat/media/media_recorder_observer.cpp (+127/-0) android/compat/media/media_recorder_observer.h (+97/-0) android/compat/media/surface_texture_client_hybris.cpp (+466/-0) android/compat/media/surface_texture_client_hybris_priv.h (+138/-0) android/compat/surface_flinger/Android.mk (+45/-0) android/compat/surface_flinger/direct_sf_test.cpp (+233/-0) android/compat/surface_flinger/surface_flinger_compatibility_layer.cpp (+366/-0) android/compat/ui/Android.mk (+26/-0) android/compat/ui/ui_compatibility_layer.cpp (+144/-0) debian/control (+50/-11) debian/libandroid-compat-dev.install (+10/-0) debian/libandroid-compat1.install (+5/-0) debian/libmedia-dev.install (+3/-0) debian/libmedia1.install (+1/-0) include/CMakeLists.txt (+1/-0) include/hybris/CMakeLists.txt (+5/-0) include/hybris/camera/CMakeLists.txt (+6/-0) include/hybris/camera/camera_compatibility_layer.h (+156/-0) include/hybris/camera/camera_compatibility_layer_capabilities.h (+160/-0) include/hybris/camera/camera_compatibility_layer_configuration_translator.h (+186/-0) include/hybris/input/CMakeLists.txt (+8/-0) include/hybris/input/input_stack_compatibility_layer.h (+127/-0) include/hybris/input/input_stack_compatibility_layer_codes_key.h (+266/-0) include/hybris/input/input_stack_compatibility_layer_flags.h (+72/-0) include/hybris/input/input_stack_compatibility_layer_flags_key.h (+190/-0) include/hybris/input/input_stack_compatibility_layer_flags_motion.h (+149/-0) include/hybris/media/CMakeLists.txt (+11/-0) include/hybris/media/decoding_service.h (+39/-0) include/hybris/media/media_codec_layer.h (+102/-0) include/hybris/media/media_codec_list.h (+56/-0) include/hybris/media/media_compatibility_layer.h (+75/-0) include/hybris/media/media_format_layer.h (+58/-0) include/hybris/media/media_recorder_layer.h (+141/-0) include/hybris/media/recorder_compatibility_layer.h (+126/-0) include/hybris/media/surface_texture_client_hybris.h (+78/-0) include/hybris/surface_flinger/CMakeLists.txt (+4/-0) include/hybris/surface_flinger/surface_flinger_compatibility_layer.h (+85/-0) include/hybris/ui/CMakeLists.txt (+4/-0) include/hybris/ui/ui_compatibility_layer.h (+64/-0) src/CMakeLists.txt (+1/-0) src/compat/CMakeLists.txt (+6/-0) src/compat/camera/CMakeLists.txt (+17/-0) src/compat/camera/camera.c (+144/-0) src/compat/camera/libcamera.pc.in (+10/-0) src/compat/input/CMakeLists.txt (+17/-0) src/compat/input/Makefile.am (+17/-0) src/compat/input/is.c (+44/-0) src/compat/input/libis.pc.in (+10/-0) src/compat/media/CMakeLists.txt (+17/-0) src/compat/media/Makefile.am (+17/-0) src/compat/media/libmedia.pc.in (+10/-0) src/compat/media/media.c (+302/-0) src/compat/sf/CMakeLists.txt (+17/-0) src/compat/sf/Makefile.am (+17/-0) src/compat/sf/libsf.pc.in (+10/-0) src/compat/sf/sf.c (+59/-0) src/compat/ui/CMakeLists.txt (+13/-0) src/compat/ui/ui.c (+58/-0) src/compat/wifi/CMakeLists.txt (+17/-0) src/compat/wifi/Makefile.am (+17/-0) src/compat/wifi/libwifi.pc.in (+10/-0) src/compat/wifi/wifi.c (+51/-0) src/ubuntu/application/CMakeLists.txt (+2/-3) src/ubuntu/hardware/CMakeLists.txt (+1/-1) src/ubuntu/hardware/alarms/CMakeLists.txt (+2/-2) |
| To merge this branch: | bzr merge lp://staging/~morphis/platform-api/add-hybris-compat-layer |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| PS Jenkins bot | continuous-integration | Needs Fixing | |
| Ubuntu Phablet Team | Pending | ||
|
Review via email:
|
|||
Commit message
Adding Android compatibility from libhybris which should not be part of libhybris anymore as its Ubuntu specific and already dropped upstream.
Description of the change
Adding Android compatibility from libhybris which should not be part of libhybris anymore as its Ubuntu specific and already dropped upstream.
To post a comment you must log in.
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| Simon Fels (morphis) wrote | # |
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Needs Fixing
(continuous-integration)
Unmerged revisions
- 325. By Simon Fels
-
debian: only build on platforms we support
- 324. By Simon Fels
-
Correct android-headers dependency
- 323. By Simon Fels
-
Add arch specifier for android-headers too
- 322. By Simon Fels
-
Check correct variable to find out if hybris is available or not
- 321. By Simon Fels
-
Only depend on hybris for platforms its available on
- 320. By Simon Fels
-
Add temporary build-dep on libhybris-dev
- 319. By Simon Fels
-
Correct pkgconfig file references
- 318. By Simon Fels
-
Add necessary debian packaging
- 317. By Simon Fels
-
Integrate libhybris compatibility layer
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
FAILED: Continuous integration, rev:317
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https:/
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild:
http://