diff options
| author | Tao Bao <tbao@google.com> | 2018-05-12 02:55:35 +0200 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-05-12 02:55:35 +0200 |
| commit | 1f0b9962b0b5c7b008e770b07010ae1e52417214 (patch) | |
| tree | 03711539bfcdbeec43ed51b55052f17bdf56246d /Android.mk | |
| parent | Merge "screen_ui: Fix an issue in RTL locale detection." (diff) | |
| parent | Clean up the Makefile for recovery and tests. (diff) | |
| download | android_bootable_recovery-1f0b9962b0b5c7b008e770b07010ae1e52417214.tar android_bootable_recovery-1f0b9962b0b5c7b008e770b07010ae1e52417214.tar.gz android_bootable_recovery-1f0b9962b0b5c7b008e770b07010ae1e52417214.tar.bz2 android_bootable_recovery-1f0b9962b0b5c7b008e770b07010ae1e52417214.tar.lz android_bootable_recovery-1f0b9962b0b5c7b008e770b07010ae1e52417214.tar.xz android_bootable_recovery-1f0b9962b0b5c7b008e770b07010ae1e52417214.tar.zst android_bootable_recovery-1f0b9962b0b5c7b008e770b07010ae1e52417214.zip | |
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 95 |
1 files changed, 51 insertions, 44 deletions
diff --git a/Android.mk b/Android.mk index a9631bf41..214d028da 100644 --- a/Android.mk +++ b/Android.mk @@ -28,32 +28,6 @@ recovery_common_cflags := \ -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 @@ endif 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_MODULE := recovery 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 += \ @@ -159,39 +153,52 @@ LOCAL_C_INCLUDES += \ 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 \ + libcrypto_utils \ + libcrypto \ libext4_utils \ + libfs_mgr \ libpng \ libsparse \ - libziparchive \ - libcrypto_utils \ - libcrypto \ libvintf_recovery \ libvintf \ libhidl-gen-utils \ libtinyxml2 \ + libziparchive \ libbase \ libcutils \ libutils \ 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) |