bonito and sargo: initial device support

Bug: 111163725
Change-Id: I00af3102379676cedf818caa2e86c5e1593a48da
Signed-off-by: Roger Liao <rogerliao@google.com>

2 files changed, 6 insertions, 6 deletions

diff --git a/recovery/Android.bp b/recovery/Android.bp
index 4207124b..0eee04bb 100644
--- a/recovery/Android.bp
+++ b/recovery/Android.bp
@@ -15,7 +15,7 @@
 //
 
 cc_library_static {
-    name: "librecovery_ui_crosshatch",
+    name: "librecovery_ui_bonito",
     owner: "google",
     cflags: [
         "-Wall",
diff --git a/recovery/recovery_ui.cpp b/recovery/recovery_ui.cpp
index 870831cc..4207725f 100644
--- a/recovery/recovery_ui.cpp
+++ b/recovery/recovery_ui.cpp
@@ -27,7 +27,7 @@
 namespace android {
 namespace device {
 namespace google {
-namespace crosshatch {
+namespace bonito {
 
 namespace {
 
@@ -59,10 +59,10 @@ bool WipeTitanM() {
 
 } // namespace
 
-class CrosshatchDevice : public ::Device
+class BonitoDevice : public ::Device
 {
 public:
-    CrosshatchDevice(::ScreenRecoveryUI* const ui) : ::Device(ui) {}
+    BonitoDevice(::ScreenRecoveryUI* const ui) : ::Device(ui) {}
 
     /** Hook to wipe user data not stored in /data */
     bool PostWipeData() override {
@@ -81,12 +81,12 @@ public:
     }
 };
 
-} // namespace crosshatch
+} // namespace bonito
 } // namespace google
 } // namespace device
 } // namespace android
 
 Device *make_device()
 {
-    return new ::android::device::google::crosshatch::CrosshatchDevice(new ::ScreenRecoveryUI);
+    return new ::android::device::google::bonito::BonitoDevice(new ::ScreenRecoveryUI);
 }