commit cc368fdea6e5415be541dadfe04107b76a82c537
author Ying Wang <wangying@google.com> Wed Mar 11 17:57:01 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Mar 11 17:57:01 2015 +0000
tree acca2890168cf37e6d5c4cd877636f47dcc7ad32
parent fb7d896595d1fefe0b73bbebb1e4a0c027e4fab7
parent 8290aa501f1b0354262c304962bc4da2e30457a8

am 8290aa50: Merge "Install the recovery binary directly to the recovery image."

* commit '8290aa501f1b0354262c304962bc4da2e30457a8':
  Install the recovery binary directly to the recovery image.

Android.mk

diff --git a/Android.mk b/Android.mk
index 9fd3f86..dd1e96e 100644
--- a/Android.mk
+++ b/Android.mk
@@ -84,11 +84,7 @@
     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