From 9e7ae8a62652258f3ecbf147b578b73286f6d4d8 Mon Sep 17 00:00:00 2001
From: Elliott Hughes <enh@google.com>
Date: Thu, 9 Apr 2015 13:40:31 -0700
Subject: Move default implementations into Device.

The current abstract class was a nice idea but has led to a lot of
copy & paste in practice. Right now, no one we know of has any extra
menu items, so let's make the default menu available to everyone.

(If we assume that someone somewhere really does need custom
device-specific menu options, a better API would let them add to
our menu rather than replacing it.)

Change-Id: I59f6a92f3ecd830c2ce78ce9da19eaaf472c5dfa
---
 Android.mk | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'Android.mk')

diff --git a/Android.mk b/Android.mk
index dd1e96e7a..a567aa5a2 100644
--- a/Android.mk
+++ b/Android.mk
@@ -30,16 +30,17 @@ include $(BUILD_STATIC_LIBRARY)
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := \
-    recovery.cpp \
+    adb_install.cpp \
+    asn1_decoder.cpp \
     bootloader.cpp \
+    device.cpp \
+    fuse_sdcard_provider.c \
     install.cpp \
+    recovery.cpp \
     roots.cpp \
-    ui.cpp \
     screen_ui.cpp \
-    asn1_decoder.cpp \
+    ui.cpp \
     verifier.cpp \
-    adb_install.cpp \
-    fuse_sdcard_provider.c
 
 LOCAL_MODULE := recovery
 
-- 
cgit v1.2.3