summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2018-05-01 04:04:03 +0200
committerandroid-build-merger <android-build-merger@google.com>2018-05-01 04:04:03 +0200
commit7e6119125834b7c9bc9acc5a6beaf73d3c2630a2 (patch)
tree70d96e99ec327a6a6ef328193c6d880252668bc8
parentMerge changes I78839ed4,I75ac0e26 (diff)
parentMerge "Drop '#include "ui.h"' from device.h." (diff)
downloadandroid_bootable_recovery-7e6119125834b7c9bc9acc5a6beaf73d3c2630a2.tar
android_bootable_recovery-7e6119125834b7c9bc9acc5a6beaf73d3c2630a2.tar.gz
android_bootable_recovery-7e6119125834b7c9bc9acc5a6beaf73d3c2630a2.tar.bz2
android_bootable_recovery-7e6119125834b7c9bc9acc5a6beaf73d3c2630a2.tar.lz
android_bootable_recovery-7e6119125834b7c9bc9acc5a6beaf73d3c2630a2.tar.xz
android_bootable_recovery-7e6119125834b7c9bc9acc5a6beaf73d3c2630a2.tar.zst
android_bootable_recovery-7e6119125834b7c9bc9acc5a6beaf73d3c2630a2.zip
-rw-r--r--device.cpp2
-rw-r--r--device.h3
2 files changed, 4 insertions, 1 deletions
diff --git a/device.cpp b/device.cpp
index f881daff6..3b0942c49 100644
--- a/device.cpp
+++ b/device.cpp
@@ -16,6 +16,8 @@
#include "device.h"
+#include "ui.h"
+
static const char* MENU_ITEMS[] = {
"Reboot system now",
"Reboot to bootloader",
diff --git a/device.h b/device.h
index 74745b36c..4ea3159bd 100644
--- a/device.h
+++ b/device.h
@@ -17,7 +17,8 @@
#ifndef _RECOVERY_DEVICE_H
#define _RECOVERY_DEVICE_H
-#include "ui.h"
+// Forward declaration to avoid including "ui.h".
+class RecoveryUI;
class Device {
public: