aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYing Wang <wangying@google.com>2015-03-10 11:56:56 -0700
committerYing Wang <wangying@google.com>2015-03-10 11:58:37 -0700
commit5a50b1bce574f9a6b786f7139ca576fcdedb467b (patch)
tree8d37c46183371d33865bf67804134e31c7292de6
parent00c985786718db017ea9d24b076329a83e450cbc (diff)
downloadbootable_recovery-5a50b1bce574f9a6b786f7139ca576fcdedb467b.zip
bootable_recovery-5a50b1bce574f9a6b786f7139ca576fcdedb467b.tar.gz
bootable_recovery-5a50b1bce574f9a6b786f7139ca576fcdedb467b.tar.bz2
Install the recovery binary directly to the recovery image.
This eliminated the previous hack, that doesn't work reliably with the "LOCAL_REQUIRED_MODULES := mkfs.f2fs". Bug: 19666886 Change-Id: I1f0a2d41129f402c0165f3b86b6fda077291f282
-rw-r--r--Android.mk6
1 files changed, 1 insertions, 5 deletions
diff --git a/Android.mk b/Android.mk
index 9fd3f86..dd1e96e 100644
--- a/Android.mk
+++ b/Android.mk
@@ -84,11 +84,7 @@ ifeq ($(TARGET_USERIMAGES_USE_EXT4), true)
LOCAL_STATIC_LIBRARIES += libext4_utils_static libz
endif
-# This binary is in the recovery ramdisk, which is otherwise a copy of root.
-# It gets copied there in config/Makefile. LOCAL_MODULE_TAGS suppresses
-# a (redundant) copy of the binary in /system/bin for user builds.
-# TODO: Build the ramdisk image in a more principled way.
-LOCAL_MODULE_TAGS := eng
+LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/sbin
ifeq ($(TARGET_RECOVERY_UI_LIB),)
LOCAL_SRC_FILES += default_device.cpp