2 files changed, 66 insertions, 57 deletions

diff --git a/Android.mk b/Android.mk
index 09feba289..efd7462c2 100644
--- a/Android.mk
+++ b/Android.mk
@@ -97,12 +97,61 @@ endif
 
 include $(BUILD_STATIC_LIBRARY)
 
+# Health HAL dependency
+health_hal_static_libraries := \
+    android.hardware.health@2.0-impl \
+    android.hardware.health@2.0 \
+    android.hardware.health@1.0 \
+    android.hardware.health@1.0-convert \
+    libhealthstoragedefault \
+    libhidltransport \
+    libhidlbase \
+    libhwbinder_noltopgo \
+    libvndksupport \
+    libbatterymonitor
+
+librecovery_static_libraries := \
+    $(TARGET_RECOVERY_UI_LIB) \
+    libbootloader_message \
+    libfusesideload \
+    libminadbd \
+    librecovery_ui \
+    libminui \
+    libverifier \
+    libotautil \
+    $(health_hal_static_libraries) \
+    libasyncio \
+    libcrypto_utils \
+    libcrypto \
+    libext4_utils \
+    libfs_mgr \
+    libpng \
+    libsparse \
+    libvintf_recovery \
+    libvintf \
+    libhidl-gen-utils \
+    libtinyxml2 \
+    libziparchive \
+    libbase \
+    libutils \
+    libcutils \
+    liblog \
+    libselinux \
+    libz \
+
 # librecovery (static library)
 # ===============================
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := \
-    install.cpp
+    adb_install.cpp \
+    fuse_sdcard_provider.cpp \
+    install.cpp \
+    recovery.cpp \
+    roots.cpp \
+
+LOCAL_C_INCLUDES := \
+    system/vold \
 
 LOCAL_CFLAGS := $(recovery_common_cflags)
 
@@ -113,13 +162,7 @@ endif
 LOCAL_MODULE := librecovery
 
 LOCAL_STATIC_LIBRARIES := \
-    libminui \
-    libotautil \
-    libvintf_recovery \
-    libcrypto_utils \
-    libcrypto \
-    libbase \
-    libziparchive \
+    $(librecovery_static_libraries)
 
 include $(BUILD_STATIC_LIBRARY)
 
@@ -128,12 +171,8 @@ include $(BUILD_STATIC_LIBRARY)
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := \
-    adb_install.cpp \
-    fuse_sdcard_provider.cpp \
     logging.cpp \
-    recovery.cpp \
     recovery_main.cpp \
-    roots.cpp \
 
 LOCAL_MODULE := recovery
 
@@ -147,51 +186,9 @@ LOCAL_USE_CLANG_LLD := false
 
 LOCAL_CFLAGS := $(recovery_common_cflags)
 
-LOCAL_C_INCLUDES += \
-    system/vold \
-
-# Health HAL dependency
 LOCAL_STATIC_LIBRARIES := \
-    android.hardware.health@2.0-impl \
-    android.hardware.health@2.0 \
-    android.hardware.health@1.0 \
-    android.hardware.health@1.0-convert \
-    libhealthstoragedefault \
-    libhidltransport \
-    libhidlbase \
-    libhwbinder_noltopgo \
-    libvndksupport \
-    libbatterymonitor
-
-LOCAL_STATIC_LIBRARIES += \
     librecovery \
-    $(TARGET_RECOVERY_UI_LIB) \
-    libbootloader_message \
-    libfusesideload \
-    libminadbd \
-    librecovery_ui \
-    libminui \
-    libverifier \
-    libotautil \
-    libasyncio \
-    libbatterymonitor \
-    libcrypto_utils \
-    libcrypto \
-    libext4_utils \
-    libfs_mgr \
-    libpng \
-    libsparse \
-    libvintf_recovery \
-    libvintf \
-    libhidl-gen-utils \
-    libtinyxml2 \
-    libziparchive \
-    libbase \
-    libutils \
-    libcutils \
-    liblog \
-    libselinux \
-    libz \
+    $(librecovery_static_libraries)
 
 LOCAL_HAL_STATIC_LIBRARIES := libhealthd
 
diff --git a/tests/Android.mk b/tests/Android.mk
index cdc5b523a..efe46b8ee 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -150,6 +150,18 @@ libupdater_static_libraries := \
     libbrotli \
     $(tune2fs_static_libraries)
 
+health_hal_static_libraries := \
+    android.hardware.health@2.0-impl \
+    android.hardware.health@2.0 \
+    android.hardware.health@1.0 \
+    android.hardware.health@1.0-convert \
+    libhealthstoragedefault \
+    libhidltransport \
+    libhidlbase \
+    libhwbinder_noltopgo \
+    libvndksupport \
+    libbatterymonitor
+
 librecovery_static_libraries := \
     librecovery \
     $(TARGET_RECOVERY_UI_LIB) \
@@ -160,8 +172,8 @@ librecovery_static_libraries := \
     libminui \
     libverifier \
     libotautil \
+    $(health_hal_static_libraries) \
     libasyncio \
-    libbatterymonitor \
     libcrypto_utils \
     libcrypto \
     libext4_utils \
@@ -174,8 +186,8 @@ librecovery_static_libraries := \
     libtinyxml2 \
     libziparchive \
     libbase \
-    libcutils \
     libutils \
+    libcutils \
     liblog \
     libselinux \
     libz \