From 03ea978f63ee8045f100687f23bc78749d66528a Mon Sep 17 00:00:00 2001 From: Ethan Yonker Date: Mon, 17 Nov 2014 09:36:46 -0600 Subject: Clean up make flash utility make files Change-Id: Ie396be7d9636a8b481bcf7c062f94ce51a4b1fde --- flashutils/Android.mk | 12 ++++-------- mtdutils/Android.mk | 5 ++--- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/flashutils/Android.mk b/flashutils/Android.mk index a697a0998..ab552b1ed 100644 --- a/flashutils/Android.mk +++ b/flashutils/Android.mk @@ -83,8 +83,7 @@ LOCAL_SRC_FILES := flashutils.c LOCAL_MODULE := libflashutils LOCAL_MODULE_TAGS := eng LOCAL_C_INCLUDES += $(commands_recovery_local_path) -LOCAL_SHARED_LIBRARIES := libc libmmcutils libbmlutils libcrecovery -LOCAL_STATIC_LIBRARIES := libmtdutils +LOCAL_SHARED_LIBRARIES := libc libmtdutils libmmcutils libbmlutils libcrecovery BOARD_RECOVERY_DEFINES := BOARD_BML_BOOT BOARD_BML_RECOVERY @@ -102,8 +101,7 @@ LOCAL_MODULE_TAGS := eng LOCAL_MODULE_CLASS := RECOVERY_EXECUTABLES LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/sbin LOCAL_SRC_FILES := flash_image.c -LOCAL_SHARED_LIBRARIES := libflashutils libmmcutils libbmlutils libcutils libc -LOCAL_STATIC_LIBRARIES := libmtdutils +LOCAL_SHARED_LIBRARIES := libmtdutils libflashutils libmmcutils libbmlutils libcutils libc include $(BUILD_EXECUTABLE) include $(CLEAR_VARS) @@ -112,8 +110,7 @@ LOCAL_MODULE_TAGS := eng LOCAL_MODULE_CLASS := RECOVERY_EXECUTABLES LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/sbin LOCAL_SRC_FILES := dump_image.c -LOCAL_SHARED_LIBRARIES := libflashutils libmmcutils libbmlutils libcutils libc -LOCAL_STATIC_LIBRARIES := libmtdutils +LOCAL_SHARED_LIBRARIES := libmtdutils libflashutils libmmcutils libbmlutils libcutils libc include $(BUILD_EXECUTABLE) include $(CLEAR_VARS) @@ -122,8 +119,7 @@ LOCAL_MODULE_TAGS := eng LOCAL_MODULE_CLASS := RECOVERY_EXECUTABLES LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/sbin LOCAL_SRC_FILES := erase_image.c -LOCAL_SHARED_LIBRARIES := libflashutils libmmcutils libbmlutils libcutils libc -LOCAL_STATIC_LIBRARIES := libmtdutils +LOCAL_SHARED_LIBRARIES := libmtdutils libflashutils libmmcutils libbmlutils libcutils libc include $(BUILD_EXECUTABLE) endif # !TARGET_SIMULATOR diff --git a/mtdutils/Android.mk b/mtdutils/Android.mk index cdde25f31..2a380ae3d 100644 --- a/mtdutils/Android.mk +++ b/mtdutils/Android.mk @@ -30,7 +30,7 @@ LOCAL_CFLAGS += -DRK3X endif LOCAL_MODULE := libmtdutils -LOCAL_STATIC_LIBRARIES := libcutils libc +LOCAL_SHARED_LIBRARIES := libcutils libc include $(BUILD_SHARED_LIBRARY) @@ -52,8 +52,7 @@ LOCAL_MODULE_PATH := $(PRODUCT_OUT)/utilities LOCAL_UNSTRIPPED_PATH := $(PRODUCT_OUT)/symbols/utilities LOCAL_MODULE_STEM := bml_over_mtd LOCAL_C_INCLUDES += $(commands_recovery_local_path)/mtdutils -LOCAL_STATIC_LIBRARIES := libmtdutils -LOCAL_SHARED_LIBRARIES := libcutils liblog libc +LOCAL_SHARED_LIBRARIES := libmtdutils libcutils liblog libc include $(BUILD_EXECUTABLE) endif -- cgit v1.2.3