diff options
| -rw-r--r-- | Android.mk | 4 | ||||
| -rw-r--r-- | minui/graphics_drm.cpp | 14 | ||||
| -rw-r--r-- | minui/graphics_fbdev.cpp | 2 | ||||
| -rw-r--r-- | update_verifier/Android.bp | 19 |
4 files changed, 33 insertions, 6 deletions
diff --git a/Android.mk b/Android.mk index 96af417bf..4a730b585 100644 --- a/Android.mk +++ b/Android.mk @@ -45,8 +45,8 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \ $(TARGET_RECOVERY_UI_LIB) LOCAL_SHARED_LIBRARIES := \ - libbase \ - liblog \ + libbase.recovery \ + liblog.recovery \ librecovery_ui.recovery include $(BUILD_SHARED_LIBRARY) diff --git a/minui/graphics_drm.cpp b/minui/graphics_drm.cpp index 95759e382..9d31ff7a9 100644 --- a/minui/graphics_drm.cpp +++ b/minui/graphics_drm.cpp @@ -105,6 +105,8 @@ std::unique_ptr<GRSurfaceDrm> GRSurfaceDrm::Create(int drm_fd, int width, int he perror("Failed to DRM_IOCTL_MODE_CREATE_DUMB"); return nullptr; } + printf("Allocating buffer with resolution %d x %d pitch: %d bpp: %d, size: %llu\n", width, height, + create_dumb.pitch, create_dumb.bpp, create_dumb.size); // Cannot use std::make_unique to access non-public ctor. auto surface = std::unique_ptr<GRSurfaceDrm>(new GRSurfaceDrm( @@ -128,13 +130,14 @@ std::unique_ptr<GRSurfaceDrm> GRSurfaceDrm::Create(int drm_fd, int width, int he return nullptr; } - auto mmapped = mmap(nullptr, surface->height * surface->row_bytes, PROT_READ | PROT_WRITE, - MAP_SHARED, drm_fd, map_dumb.offset); + auto mmapped = + mmap(nullptr, create_dumb.size, PROT_READ | PROT_WRITE, MAP_SHARED, drm_fd, map_dumb.offset); if (mmapped == MAP_FAILED) { perror("Failed to mmap()"); return nullptr; } surface->mmapped_buffer_ = static_cast<uint8_t*>(mmapped); + printf("Framebuffer of size %llu allocated @ %p\n", create_dumb.size, surface->mmapped_buffer_); return surface; } @@ -260,9 +263,16 @@ drmModeConnector* MinuiBackendDrm::FindMainMonitor(int fd, drmModeRes* resources /* If we still didn't find a connector, give up and return. */ if (!main_monitor_connector) return nullptr; + for (int modes = 0; modes < main_monitor_connector->count_modes; modes++) { + printf("Display Mode %d resolution: %d x %d @ %d FPS\n", modes, + main_monitor_connector->modes[modes].hdisplay, + main_monitor_connector->modes[modes].vdisplay, + main_monitor_connector->modes[modes].vrefresh); + } *mode_index = 0; for (int modes = 0; modes < main_monitor_connector->count_modes; modes++) { if (main_monitor_connector->modes[modes].type & DRM_MODE_TYPE_PREFERRED) { + printf("Choosing display mode #%d\n", modes); *mode_index = modes; break; } diff --git a/minui/graphics_fbdev.cpp b/minui/graphics_fbdev.cpp index 2584017d6..0d0fabce6 100644 --- a/minui/graphics_fbdev.cpp +++ b/minui/graphics_fbdev.cpp @@ -131,8 +131,6 @@ GRSurface* MinuiBackendFbdev::Init() { SetDisplayedFramebuffer(0); printf("framebuffer: %d (%zu x %zu)\n", fb_fd.get(), gr_draw->width, gr_draw->height); - - Blank(true); Blank(false); return gr_draw; diff --git a/update_verifier/Android.bp b/update_verifier/Android.bp index ff2eff903..220b007f5 100644 --- a/update_verifier/Android.bp +++ b/update_verifier/Android.bp @@ -33,6 +33,25 @@ cc_defaults { ], } +python_library_host { + name: "care_map_proto_py", + srcs: [ + "care_map.proto", + ], + proto: {type: "lite", canonical_path_from_root: false}, + version: { + py2: { + enabled: true, + }, + py3: { + enabled: true, + }, + }, + visibility: [ + "//build/make/tools/releasetools:__subpackages__", + ], +} + cc_library_static { name: "libupdate_verifier", |