summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2019-01-17 18:05:08 +0100
committerandroid-build-team Robot <android-build-team-robot@google.com>2019-01-17 18:05:08 +0100
commitf9b3924ffbfe38c3c7373440c62afa6759a7ac01 (patch)
tree203f28a0519b2c5e2f72ffa416c0dff9568cdc62
parentSnap for 5235151 from fec7ff6300d8c4541daf71102c02aa70f1b8084c to qt-release (diff)
parentMerge "e2fsck_static is no longer needed for remount" am: 725d7f8dfd am: f1fd5ec266 (diff)
downloadandroid_bootable_recovery-f9b3924ffbfe38c3c7373440c62afa6759a7ac01.tar
android_bootable_recovery-f9b3924ffbfe38c3c7373440c62afa6759a7ac01.tar.gz
android_bootable_recovery-f9b3924ffbfe38c3c7373440c62afa6759a7ac01.tar.bz2
android_bootable_recovery-f9b3924ffbfe38c3c7373440c62afa6759a7ac01.tar.lz
android_bootable_recovery-f9b3924ffbfe38c3c7373440c62afa6759a7ac01.tar.xz
android_bootable_recovery-f9b3924ffbfe38c3c7373440c62afa6759a7ac01.tar.zst
android_bootable_recovery-f9b3924ffbfe38c3c7373440c62afa6759a7ac01.zip
-rw-r--r--Android.mk8
-rw-r--r--screen_ui.cpp4
2 files changed, 2 insertions, 10 deletions
diff --git a/Android.mk b/Android.mk
index 429c52dbf..9806d1091 100644
--- a/Android.mk
+++ b/Android.mk
@@ -63,14 +63,6 @@ LOCAL_REQUIRED_MODULES += \
endif
endif
-# e2fsck is needed for adb remount -R.
-ifeq ($(BOARD_EXT4_SHARE_DUP_BLOCKS),true)
-ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT)))
-LOCAL_REQUIRED_MODULES += \
- e2fsck_static
-endif
-endif
-
# On A/B devices recovery-persist reads the recovery related file from the persist storage and
# copies them into /data/misc/recovery. Then, for both A/B and non-A/B devices, recovery-persist
# parses the last_install file and reports the embedded update metrics. Also, the last_install file
diff --git a/screen_ui.cpp b/screen_ui.cpp
index 7fa41c4e4..6c00a2235 100644
--- a/screen_ui.cpp
+++ b/screen_ui.cpp
@@ -278,12 +278,12 @@ bool GraphicMenu::Validate(size_t max_width, size_t max_height, const GRSurface*
bool GraphicMenu::ValidateGraphicSurface(size_t max_width, size_t max_height, int y,
const GRSurface* surface) {
if (!surface) {
- fprintf(stderr, "Graphic surface can not be null");
+ fprintf(stderr, "Graphic surface can not be null\n");
return false;
}
if (surface->pixel_bytes != 1 || surface->width != surface->row_bytes) {
- fprintf(stderr, "Invalid graphic surface, pixel bytes: %zu, width: %zu row_bytes: %zu",
+ fprintf(stderr, "Invalid graphic surface, pixel bytes: %zu, width: %zu row_bytes: %zu\n",
surface->pixel_bytes, surface->width, surface->row_bytes);
return false;
}