juggle around some of the ext handling tools. add setprop link (2e85422f) · Commits · e / os / android_bootable_recovery

Android.mk

+2 −2

Original line number	Diff line number	Diff line
		@@ -37,7 +37,7 @@ else
		RECOVERY_NAME := CWM-based Recovery
		endif

		RECOVERY_VERSION := $(RECOVERY_NAME) v5.0.2.3
		RECOVERY_VERSION := $(RECOVERY_NAME) v5.0.2.6

		LOCAL_CFLAGS += -DRECOVERY_VERSION="$(RECOVERY_VERSION)"
		RECOVERY_API_VERSION := 2
		@@ -84,7 +84,7 @@ LOCAL_C_INCLUDES += system/extras/ext4_utils

		include $(BUILD_EXECUTABLE)

		RECOVERY_LINKS := edify busybox flash_image dump_image mkyaffs2image unyaffs erase_image nandroid reboot volume
		RECOVERY_LINKS := edify busybox flash_image dump_image mkyaffs2image unyaffs erase_image nandroid reboot volume setprop

		# nc is provided by external/netcat
		RECOVERY_SYMLINKS := $(addprefix $(TARGET_RECOVERY_ROOT_OUT)/sbin/,$(RECOVERY_LINKS))

+8 −5

Original line number	Diff line number	Diff line
		@@ -2,8 +2,9 @@ LOCAL_PATH := $(call my-dir)

		ifndef BOARD_HAS_SMALL_RECOVERY


		include $(CLEAR_VARS)
		LOCAL_MODULE := e2fsck
		LOCAL_MODULE := fix_permissions
		LOCAL_MODULE_TAGS := eng
		LOCAL_MODULE_CLASS := RECOVERY_EXECUTABLES
		LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/sbin
		@@ -11,7 +12,7 @@ LOCAL_SRC_FILES := $(LOCAL_MODULE)
		include $(BUILD_PREBUILT)

		include $(CLEAR_VARS)
		LOCAL_MODULE := fix_permissions
		LOCAL_MODULE := parted
		LOCAL_MODULE_TAGS := eng
		LOCAL_MODULE_CLASS := RECOVERY_EXECUTABLES
		LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/sbin
		@@ -19,21 +20,24 @@ LOCAL_SRC_FILES := $(LOCAL_MODULE)
		include $(BUILD_PREBUILT)

		include $(CLEAR_VARS)
		LOCAL_MODULE := parted
		LOCAL_MODULE := sdparted
		LOCAL_MODULE_TAGS := eng
		LOCAL_MODULE_CLASS := RECOVERY_EXECUTABLES
		LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/sbin
		LOCAL_SRC_FILES := $(LOCAL_MODULE)
		include $(BUILD_PREBUILT)

		endif

		include $(CLEAR_VARS)
		LOCAL_MODULE := sdparted
		LOCAL_MODULE := e2fsck
		LOCAL_MODULE_TAGS := eng
		LOCAL_MODULE_CLASS := RECOVERY_EXECUTABLES
		LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/sbin
		LOCAL_SRC_FILES := $(LOCAL_MODULE)
		include $(BUILD_PREBUILT)


		include $(CLEAR_VARS)
		LOCAL_MODULE := tune2fs
		LOCAL_MODULE_TAGS := eng
		@@ -54,7 +58,6 @@ else
		LOCAL_SRC_FILES := ../../../$(BOARD_MKE2FS)
		endif
		include $(BUILD_PREBUILT)
		endif

		ifeq ($(BOARD_USES_RECOVERY_CHARGEMODE),true)
		include $(CLEAR_VARS)