diff options
| -rw-r--r-- | Android.mk | 1 | ||||
| -rw-r--r-- | otautil/Android.bp | 4 | ||||
| -rw-r--r-- | otautil/DirUtil.cpp | 2 | ||||
| -rw-r--r-- | otautil/SysUtil.cpp | 2 | ||||
| -rw-r--r-- | otautil/ThermalUtil.cpp | 4 | ||||
| -rw-r--r-- | otautil/include/otautil/DirUtil.h (renamed from otautil/DirUtil.h) | 0 | ||||
| -rw-r--r-- | otautil/include/otautil/SysUtil.h (renamed from otautil/SysUtil.h) | 0 | ||||
| -rw-r--r-- | otautil/include/otautil/ThermalUtil.h (renamed from otautil/ThermalUtil.h) | 0 | ||||
| -rw-r--r-- | screen_ui.cpp | 2 |
9 files changed, 10 insertions, 5 deletions
diff --git a/Android.mk b/Android.mk index c55771fbe..ac72bac01 100644 --- a/Android.mk +++ b/Android.mk @@ -56,6 +56,7 @@ endif LOCAL_MODULE := librecovery LOCAL_STATIC_LIBRARIES := \ libminui \ + libotautil \ libvintf_recovery \ libcrypto_utils \ libcrypto \ diff --git a/otautil/Android.bp b/otautil/Android.bp index a2eaa0402..9cde7baa7 100644 --- a/otautil/Android.bp +++ b/otautil/Android.bp @@ -30,4 +30,8 @@ cc_library_static { "-Werror", "-Wall", ], + + export_include_dirs: [ + "include", + ], } diff --git a/otautil/DirUtil.cpp b/otautil/DirUtil.cpp index fffc82219..61c832813 100644 --- a/otautil/DirUtil.cpp +++ b/otautil/DirUtil.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "DirUtil.h" +#include "otautil/DirUtil.h" #include <dirent.h> #include <errno.h> diff --git a/otautil/SysUtil.cpp b/otautil/SysUtil.cpp index dfa215073..d54a824d2 100644 --- a/otautil/SysUtil.cpp +++ b/otautil/SysUtil.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "SysUtil.h" +#include "otautil/SysUtil.h" #include <fcntl.h> #include <stdint.h> // SIZE_MAX diff --git a/otautil/ThermalUtil.cpp b/otautil/ThermalUtil.cpp index 13d36432a..5d9bd45c0 100644 --- a/otautil/ThermalUtil.cpp +++ b/otautil/ThermalUtil.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "ThermalUtil.h" +#include "otautil/ThermalUtil.h" #include <dirent.h> #include <stdio.h> @@ -77,4 +77,4 @@ int GetMaxValueFromThermalZone() { } LOG(INFO) << "current maximum temperature: " << max_temperature; return max_temperature; -}
\ No newline at end of file +} diff --git a/otautil/DirUtil.h b/otautil/include/otautil/DirUtil.h index 85d6c16d1..85d6c16d1 100644 --- a/otautil/DirUtil.h +++ b/otautil/include/otautil/DirUtil.h diff --git a/otautil/SysUtil.h b/otautil/include/otautil/SysUtil.h index 52f6d20a7..52f6d20a7 100644 --- a/otautil/SysUtil.h +++ b/otautil/include/otautil/SysUtil.h diff --git a/otautil/ThermalUtil.h b/otautil/include/otautil/ThermalUtil.h index 43ab55940..43ab55940 100644 --- a/otautil/ThermalUtil.h +++ b/otautil/include/otautil/ThermalUtil.h diff --git a/screen_ui.cpp b/screen_ui.cpp index bc5c5c31f..166d7b4cf 100644 --- a/screen_ui.cpp +++ b/screen_ui.cpp @@ -165,7 +165,7 @@ void ScreenRecoveryUI::draw_background_locked() { int stage_height = gr_get_height(stageMarkerEmpty); int stage_width = gr_get_width(stageMarkerEmpty); int x = (gr_fb_width() - max_stage * gr_get_width(stageMarkerEmpty)) / 2; - int y = gr_fb_height() - stage_height; + int y = gr_fb_height() - stage_height - kMarginHeight; for (int i = 0; i < max_stage; ++i) { GRSurface* stage_surface = (i < stage) ? stageMarkerFill : stageMarkerEmpty; gr_blit(stage_surface, 0, 0, stage_width, stage_height, x, y); |