summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYing Wang <wangying@google.com>2015-03-11 18:57:01 +0100
committerAndroid Git Automerger <android-git-automerger@android.com>2015-03-11 18:57:01 +0100
commitcc368fdea6e5415be541dadfe04107b76a82c537 (patch)
treeacca2890168cf37e6d5c4cd877636f47dcc7ad32
parentam 023e4374: am 579b9299: (-s ours) Merge "Remove more dead code from minzip." (diff)
parentMerge "Install the recovery binary directly to the recovery image." (diff)
downloadandroid_bootable_recovery-cc368fdea6e5415be541dadfe04107b76a82c537.tar
android_bootable_recovery-cc368fdea6e5415be541dadfe04107b76a82c537.tar.gz
android_bootable_recovery-cc368fdea6e5415be541dadfe04107b76a82c537.tar.bz2
android_bootable_recovery-cc368fdea6e5415be541dadfe04107b76a82c537.tar.lz
android_bootable_recovery-cc368fdea6e5415be541dadfe04107b76a82c537.tar.xz
android_bootable_recovery-cc368fdea6e5415be541dadfe04107b76a82c537.tar.zst
android_bootable_recovery-cc368fdea6e5415be541dadfe04107b76a82c537.zip
Diffstat (limited to '')
-rw-r--r--Android.mk6
1 files changed, 1 insertions, 5 deletions
diff --git a/Android.mk b/Android.mk
index 9fd3f866a..dd1e96e7a 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