From f9476fbfe8252ae111cc6792819d1e58f7a7a62a Mon Sep 17 00:00:00 2001 From: "Koushik K. Dutta" Date: Sun, 21 Feb 2010 01:02:30 -0800 Subject: [PATCH] fix build break --- mtdutils/Android.mk | 4 ++-- nandroid/Android.mk | 14 ++++++-------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/mtdutils/Android.mk b/mtdutils/Android.mk index ff4ab3f..09d0fb8 100644 --- a/mtdutils/Android.mk +++ b/mtdutils/Android.mk @@ -28,7 +28,7 @@ include $(BUILD_EXECUTABLE) include $(CLEAR_VARS) LOCAL_SRC_FILES := flash_image.c -LOCAL_MODULE_CLASS := RECOVERY_EXECUTABLE +LOCAL_MODULE_CLASS := RECOVERY_EXECUTABLES LOCAL_MODULE := recovery_flash_image LOCAL_MODULE_TAGS := eng LOCAL_STATIC_LIBRARIES := libmtdutils libcutils libc @@ -40,7 +40,7 @@ include $(BUILD_EXECUTABLE) include $(CLEAR_VARS) LOCAL_SRC_FILES := dump_image.c mtdutils.c mounts.c -LOCAL_MODULE_CLASS := RECOVERY_EXECUTABLE +LOCAL_MODULE_CLASS := RECOVERY_EXECUTABLES LOCAL_MODULE := recovery_dump_image LOCAL_MODULE_TAGS := eng LOCAL_STATIC_LIBRARIES := libcutils libc diff --git a/nandroid/Android.mk b/nandroid/Android.mk index 79acc32..9423c09 100644 --- a/nandroid/Android.mk +++ b/nandroid/Android.mk @@ -1,10 +1,8 @@ -ifneq ($(TARGET_SIMULATOR),true) -ifeq ($(TARGET_ARCH),arm) - LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := recovery_nandroid -LOCAL_MODULE_CLASS := RECOVERY_EXECUTABLE +LOCAL_MODULE_TAGS := eng +LOCAL_MODULE_CLASS := RECOVERY_EXECUTABLES LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/sbin LOCAL_SRC_FILES := nandroid-mobile.sh LOCAL_MODULE_STEM := nandroid-mobile.sh @@ -14,19 +12,19 @@ include $(BUILD_PREBUILT) include $(CLEAR_VARS) LOCAL_MODULE := recovery_unyaffs LOCAL_MODULE_STEM := unyaffs -LOCAL_MODULE_CLASS := RECOVERY_EXECUTABLE +LOCAL_MODULE_CLASS := RECOVERY_EXECUTABLES +LOCAL_MODULE_TAGS := eng LOCAL_FORCE_STATIC_EXECUTABLE := true LOCAL_SRC_FILES := unyaffs.c LOCAL_STATIC_LIBRARIES := libc libcutils LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/sbin -LOCAL_MODULE_SUBDIR := recovery ADDITIONAL_RECOVERY_EXECUTABLES += recovery_unyaffs include $(BUILD_EXECUTABLE) include $(CLEAR_VARS) LOCAL_MODULE := unyaffs LOCAL_SRC_FILES := unyaffs.c +LOCAL_MODULE_TAGS := eng include $(BUILD_EXECUTABLE) -endif # TARGET_ARCH == arm -endif # !TARGET_SIMULATOR +include $(CLEAR_VARS)