From 031163b2c6a6bf7fbcc56c2435222c2053c232ba Mon Sep 17 00:00:00 2001 From: Matt Mower Date: Sat, 1 Nov 2014 15:13:03 -0500 Subject: Remove dependence on build hax in makefiles Update makefiles to no longer rely on INTERNAL_RECOVERY_FILES. Define LOCAL_ADDITIONAL_DEPENDENCIES instead. Set LOCAL_LDFLAGS to properly link recovery executable. Change-Id: I4542104c69399b5a19674b9772ab89c3709efa72 --- flashutils/Android.mk | 26 -------------------------- 1 file changed, 26 deletions(-) (limited to 'flashutils') diff --git a/flashutils/Android.mk b/flashutils/Android.mk index 7ad313be3..3209cb0c5 100644 --- a/flashutils/Android.mk +++ b/flashutils/Android.mk @@ -19,32 +19,6 @@ $(foreach board_define,$(BOARD_RECOVERY_DEFINES), \ include $(BUILD_STATIC_LIBRARY) -include $(CLEAR_VARS) -LOCAL_SRC_FILES := flash_image.c -LOCAL_MODULE := flash_image -LOCAL_MODULE_TAGS := optional -LOCAL_STATIC_LIBRARIES := libflashutils libmtdutils libmmcutils libbmlutils libcrecovery -LOCAL_SHARED_LIBRARIES := libcutils libc -include $(BUILD_EXECUTABLE) - -include $(CLEAR_VARS) -LOCAL_SRC_FILES := dump_image.c -LOCAL_MODULE := dump_image -LOCAL_MODULE_TAGS := optional -LOCAL_STATIC_LIBRARIES := libflashutils libmtdutils libmmcutils libbmlutils libcrecovery -LOCAL_SHARED_LIBRARIES := libcutils libc -include $(BUILD_EXECUTABLE) - -include $(CLEAR_VARS) -LOCAL_SRC_FILES := erase_image.c -LOCAL_MODULE := erase_image -LOCAL_MODULE_TAGS := optional -LOCAL_STATIC_LIBRARIES := libflashutils libmtdutils libmmcutils libbmlutils libcrecovery -LOCAL_SHARED_LIBRARIES := libcutils libc -include $(BUILD_EXECUTABLE) - -ALL_DEFAULT_INSTALLED_MODULES += $(addprefix $(TARGET_OUT)/bin/, flash_image dump_image erase_image) - include $(CLEAR_VARS) LOCAL_SRC_FILES := flash_image.c LOCAL_MODULE := libflash_image -- cgit v1.2.3