Merge "Clean up the Makefile for recovery and tests." am: 1f0b9962b0
am: 0c2998ffe3
Change-Id: I5d4765279fa10317e7f8d61cc4f0972baf10040e
diff --git a/Android.mk b/Android.mk
index 2fa9d53..09feba2 100644
--- a/Android.mk
+++ b/Android.mk
@@ -28,32 +28,6 @@
-Werror \
-DRECOVERY_API_VERSION=$(RECOVERY_API_VERSION)
-# librecovery (static library)
-# ===============================
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := \
- install.cpp
-
-LOCAL_CFLAGS := $(recovery_common_cflags)
-
-ifeq ($(AB_OTA_UPDATER),true)
- LOCAL_CFLAGS += -DAB_OTA_UPDATER=1
-endif
-
-LOCAL_MODULE := librecovery
-
-LOCAL_STATIC_LIBRARIES := \
- libminui \
- libotautil \
- libvintf_recovery \
- libcrypto_utils \
- libcrypto \
- libbase \
- libziparchive \
-
-include $(BUILD_STATIC_LIBRARY)
-
# librecovery_ui (static library)
# ===============================
include $(CLEAR_VARS)
@@ -123,6 +97,32 @@
include $(BUILD_STATIC_LIBRARY)
+# librecovery (static library)
+# ===============================
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := \
+ install.cpp
+
+LOCAL_CFLAGS := $(recovery_common_cflags)
+
+ifeq ($(AB_OTA_UPDATER),true)
+ LOCAL_CFLAGS += -DAB_OTA_UPDATER=1
+endif
+
+LOCAL_MODULE := librecovery
+
+LOCAL_STATIC_LIBRARIES := \
+ libminui \
+ libotautil \
+ libvintf_recovery \
+ libcrypto_utils \
+ libcrypto \
+ libbase \
+ libziparchive \
+
+include $(BUILD_STATIC_LIBRARY)
+
# recovery (static executable)
# ===============================
include $(CLEAR_VARS)
@@ -139,18 +139,12 @@
LOCAL_FORCE_STATIC_EXECUTABLE := true
+LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/sbin
+
# Cannot link with LLD: undefined symbol: UsbNoPermissionsLongHelpText
# http://b/77543887, lld does not handle -Wl,--gc-sections as well as ld.
LOCAL_USE_CLANG_LLD := false
-LOCAL_REQUIRED_MODULES := e2fsdroid_static mke2fs_static mke2fs.conf
-
-ifeq ($(TARGET_USERIMAGES_USE_F2FS),true)
-ifeq ($(HOST_OS),linux)
-LOCAL_REQUIRED_MODULES += sload.f2fs mkfs.f2fs
-endif
-endif
-
LOCAL_CFLAGS := $(recovery_common_cflags)
LOCAL_C_INCLUDES += \
@@ -172,39 +166,52 @@
LOCAL_STATIC_LIBRARIES += \
librecovery \
$(TARGET_RECOVERY_UI_LIB) \
- librecovery_ui \
- libminui \
- libverifier \
libbootloader_message \
libfusesideload \
libminadbd \
+ librecovery_ui \
+ libminui \
+ libverifier \
libotautil \
libasyncio \
libbatterymonitor \
- libfs_mgr \
- libext4_utils \
- libpng \
- libsparse \
- libziparchive \
libcrypto_utils \
libcrypto \
+ libext4_utils \
+ libfs_mgr \
+ libpng \
+ libsparse \
libvintf_recovery \
libvintf \
libhidl-gen-utils \
libtinyxml2 \
+ libziparchive \
libbase \
libutils \
libcutils \
liblog \
libselinux \
- libz
+ libz \
LOCAL_HAL_STATIC_LIBRARIES := libhealthd
-LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/sbin
+LOCAL_REQUIRED_MODULES := \
+ e2fsdroid_static \
+ mke2fs_static \
+ mke2fs.conf
+
+ifeq ($(TARGET_USERIMAGES_USE_F2FS),true)
+ifeq ($(HOST_OS),linux)
+LOCAL_REQUIRED_MODULES += \
+ sload.f2fs \
+ mkfs.f2fs
+endif
+endif
ifeq ($(BOARD_CACHEIMAGE_PARTITION_SIZE),)
-LOCAL_REQUIRED_MODULES += recovery-persist recovery-refresh
+LOCAL_REQUIRED_MODULES += \
+ recovery-persist \
+ recovery-refresh
endif
include $(BUILD_EXECUTABLE)
diff --git a/tests/Android.mk b/tests/Android.mk
index 7234b52..cdc5b52 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -94,6 +94,26 @@
LOCAL_SHARED_LIBRARIES := \
libhidlbase
+# libapplypatch, libapplypatch_modes, libimgdiff, libimgpatch.
+libapplypatch_static_libraries := \
+ libapplypatch_modes \
+ libapplypatch \
+ libedify \
+ libimgdiff \
+ libimgpatch \
+ libotafault \
+ libotautil \
+ libbsdiff \
+ libbspatch \
+ libdivsufsort \
+ libdivsufsort64 \
+ libutils \
+ libbase \
+ libbz \
+ libcrypto \
+ libz \
+ libziparchive \
+
tune2fs_static_libraries := \
libext2_com_err \
libext2_blkid \
@@ -102,50 +122,73 @@
libext2_e2p \
libext2fs
-LOCAL_STATIC_LIBRARIES := \
- libapplypatch_modes \
- libapplypatch \
- libedify \
- libimgdiff \
- libimgpatch \
- libbsdiff \
- libbspatch \
- libfusesideload \
- libminui \
- libotafault \
- librecovery \
+libupdater_static_libraries := \
libupdater \
+ libapplypatch \
+ libbspatch \
+ libedify \
+ libziparchive \
+ libotautil \
libbootloader_message \
+ libutils \
+ libotafault \
+ libext4_utils \
+ libfec \
+ libfec_rs \
+ libfs_mgr \
+ liblog \
+ libselinux \
+ libsparse \
+ libsquashfs_utils \
+ libbz \
+ libz \
+ libbase \
+ libcrypto \
+ libcrypto_utils \
+ libcutils \
+ libtune2fs \
+ libbrotli \
+ $(tune2fs_static_libraries)
+
+librecovery_static_libraries := \
+ librecovery \
+ $(TARGET_RECOVERY_UI_LIB) \
+ libbootloader_message \
+ libfusesideload \
+ libminadbd \
+ librecovery_ui \
+ libminui \
libverifier \
libotautil \
- libupdate_verifier \
- libdivsufsort \
- libdivsufsort64 \
+ libasyncio \
+ libbatterymonitor \
+ libcrypto_utils \
+ libcrypto \
+ libext4_utils \
libfs_mgr \
libpng \
+ libsparse \
libvintf_recovery \
libvintf \
libhidl-gen-utils \
libtinyxml2 \
- libselinux \
- libext4_utils \
- libsparse \
- libcrypto_utils \
- libcrypto \
- libbz \
libziparchive \
- liblog \
- libutils \
- libz \
libbase \
- libtune2fs \
- libfec \
- libfec_rs \
- libsquashfs_utils \
libcutils \
- libbrotli \
- libBionicGtestMain \
- $(tune2fs_static_libraries)
+ libutils \
+ liblog \
+ libselinux \
+ libz \
+
+libupdate_verifier_static_libraries := \
+ libupdate_verifier \
+
+LOCAL_STATIC_LIBRARIES := \
+ $(libapplypatch_static_libraries) \
+ $(librecovery_static_libraries) \
+ $(libupdate_verifier_static_libraries) \
+ $(libupdater_static_libraries) \
+ libBionicGtestMain
LOCAL_TEST_DATA := \
$(call find-test-data-in-subdirs, $(LOCAL_PATH), "*", testdata) \