Move librecovery_ui to a sub-directory
This helps to expose librecovery_ui for device specific RecoveryUi.
Bug: 76436783
Test: mma, unit tests pass
Change-Id: Ic6c3d301d5833e4a592e6ea9d9d059bc4e4919be
(cherry picked from commit b5108c372c8b92671ea5ebb4eeff00757fcee187)
diff --git a/Android.bp b/Android.bp
index a6986bb..7b67f40 100644
--- a/Android.bp
+++ b/Android.bp
@@ -26,77 +26,6 @@
],
}
-cc_library {
- name: "librecovery_ui",
- recovery_available: true,
-
- defaults: [
- "recovery_defaults",
- ],
-
- srcs: [
- "device.cpp",
- "screen_ui.cpp",
- "ui.cpp",
- "vr_ui.cpp",
- "wear_ui.cpp"
- ],
-
- static_libs: [
- "libminui",
- "libotautil",
- "libfstab",
- ],
-
- shared_libs: [
- "libbase",
- "libpng",
- "libz",
- ],
-}
-
-// Generic device that uses ScreenRecoveryUI.
-cc_library_static {
- name: "librecovery_ui_default",
- recovery_available: true,
-
- defaults: [
- "recovery_defaults",
- ],
-
- srcs: [
- "default_device.cpp",
- ],
-}
-
-// The default wear device that uses WearRecoveryUI.
-cc_library_static {
- name: "librecovery_ui_wear",
- recovery_available: true,
-
- defaults: [
- "recovery_defaults",
- ],
-
- srcs: [
- "wear_device.cpp",
- ],
-}
-
-// The default VR device that uses VrRecoveryUI.
-cc_library_static {
- name: "librecovery_ui_vr",
- recovery_available: true,
-
- defaults: [
- "recovery_defaults",
- ],
-
- srcs: [
- "vr_device.cpp",
- ],
-}
-
cc_library_static {
name: "librecovery_fastboot",
recovery_available: true,
@@ -113,6 +42,7 @@
"libbootloader_message",
"libcutils",
"liblog",
+ "librecovery_ui",
],
static_libs: [
@@ -180,6 +110,10 @@
"roots.cpp",
],
+ shared_libs: [
+ "librecovery_ui",
+ ],
+
include_dirs: [
"system/vold",
],