commit 9b682e93f12f78926c0bbdcdfca1d33465550de6
author xunchang <xunchang@google.com> Wed Mar 20 10:31:37 2019 -0700
committer Tianjie Xu <xunchang@google.com> Fri Mar 22 18:20:11 2019 +0000
tree 9c1b287e2e98f0ca762ce60a70f3a4dd6ad95806
parent 75909e85c9c477c5847ee15bf47b02a61188457a

Use the exposed librecovery_ui in device specific recovery code

Use the librecovery_ui as shared library instead of including
bootable/recovery.

Bug: 76436783
Test: mma
Change-Id: I93b69a6104d75f07f860e48fc9994b705f60bea4
(cherry picked from commit 6698d53e91a1d76c37cbe72f38ae5d0aa3dc8d8f)

recovery/Android.bp

diff --git a/recovery/Android.bp b/recovery/Android.bp
index 0eee04b..239eee7 100644
--- a/recovery/Android.bp
+++ b/recovery/Android.bp
@@ -26,12 +26,14 @@
     srcs: [
         "recovery_ui.cpp",
     ],
-    include_dirs: [
-        "bootable/recovery"
-    ],
+
     static_libs: [
         "libbase",
         "libnos_for_recovery",
         "libnos_citadel_for_recovery",
     ],
+
+    shared_libs: [
+        "librecovery_ui",
+    ],
 }

recovery/recovery_ui.cpp

diff --git a/recovery/recovery_ui.cpp b/recovery/recovery_ui.cpp
index 4207725..55909d0 100644
--- a/recovery/recovery_ui.cpp
+++ b/recovery/recovery_ui.cpp
@@ -21,8 +21,8 @@
 #include <nos/debug.h>
 #include <nos/NuggetClient.h>
 
-#include <device.h>
-#include <screen_ui.h>
+#include <recovery_ui/device.h>
+#include <recovery_ui/screen_ui.h>
 
 namespace android {
 namespace device {